From 054f9198575570345f96cf9167191e71124b80f0 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 19 Nov 2010 18:30:14 +0530
Subject: [PATCH 01/16] remove rowheight in general ledger report.

bzr revid: apa@tinyerp.com-20101119130014-m9cd46i8e6o9a16o
---
 addons/account/report/account_general_ledger_landscape.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index dc900300e0d..516b831bac5 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -477,7 +477,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="461.0,71.0,71.0,88.0,80.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+      <blockTable colWidths="461.0,71.0,71.0,88.0,80.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
         <tr>
           <td>
             <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
@@ -498,7 +498,7 @@
       </blockTable>
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
-        <blockTable rowHeights="0.55cm" colWidths="45.0,55.0,72.0,64.0,64.0,77.0,85.0,71.0,71.0,88.0,80.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+        <blockTable colWidths="45.0,55.0,72.0,64.0,64.0,77.0,85.0,71.0,71.0,88.0,80.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
           <tr>
             <td>
               <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>

From c8e326aff9e4d41e4d1a6342d70bc3fe6301df1c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 22 Nov 2010 13:45:52 +0530
Subject: [PATCH 02/16] [IMP]:hr_payroll,account:improved report with lanscape
 size.

bzr revid: apa@tinyerp.com-20101122081552-myre4tu1iwidmjiw
---
 .../account_general_ledger_landscape.rml      |   4 +-
 .../report/report_employees_detail.rml        | 239 +++++++++++-------
 2 files changed, 145 insertions(+), 98 deletions(-)

diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 3d2b8b1eb3a..886f24f1edd 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -270,7 +270,7 @@
   <story>
   	<pto>
   	<pto_header>
-  		<blockTable colWidths="45.0,55.0,72.0,64.0,64.0,77.0,85.0,71.0,71.0,88.0,80.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+  		<blockTable colWidths="45.0,55.0,72.0,64.0,64.0,82.0,80.0,71.0,71.0,88.0,80.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
 	      <tr>
 	        <td>
 	          <para style="terp_tblheader_Details">Date</para>
@@ -307,7 +307,7 @@
 	        </td>
 	      </tr>
 	    </blockTable>
-  		<blockTable colWidths="45.0,54.0,85.0,70.0,70.0,130.0,85.0,71.0,71.0,90.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+  		<blockTable colWidths="45.0,54.0,85.0,70.0,70.0,135.0,80.0,71.0,71.0,90.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
 	      <tr>
 	        <td>
 	          <para style="terp_tblheader_Details">Date</para>
diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index a74ca7ee6f8..67a49abc4c6 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="Employees Salary Details.pdf">
-  <template pageSize="(1120.0,770.0)" title="Employees Salary Details" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(842.0,595.0)" title="Employees Salary Details" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="1064" height="714"/>
+      <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -258,90 +258,139 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]] </para>
-    <blockTable colWidths="1063.0" style="Table12">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Employees Salary Details </para>
-          <para style="terp_default_Centre_9">From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_Centre_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="135.0,219.0,124.0,218.0,140.0,226.0" style="Table2">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Employee Code</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ o.ssnid ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Department</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ o.company_id and o.company_id.name or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Bank</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="135.0,219.0,124.0,218.0,140.0,226.0" style="Table3">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Employee Name</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ o.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Other No.</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Address</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[o.address_home_id and o.address_home_id.name or '' ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="135.0,219.0,124.0,218.0,140.0,226.0" style="Table5">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Designation</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ o.contract_ids and o.contract_ids[0].job_id.name or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Phone No.</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ o.work_phone or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">E-mail Address</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[o.work_email or '' ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail(o) ]]</para>
-      <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table4">
+  <pto>
+  <pto_header>
+  <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Title</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total</para>
+          </td>
+        </tr>
+      </blockTable>
+  </pto_header>
+    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]] </para>
+    <blockTable colWidths="785.0" style="Table12">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Employees Salary Details </para>
+          <para style="terp_default_Centre_9">From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_Centre_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Employee Code</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.ssnid ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Department</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.company_id and o.company_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Bank</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Employee Name</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Other No.</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Address</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.address_home_id and o.address_home_id.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table5">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Designation</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.contract_ids and o.contract_ids[0].job_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Phone No.</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.work_phone or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">E-mail Address</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.work_email or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail(o) ]]</para>
+      <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Title</para>
@@ -387,11 +436,8 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <section>
-        <blockTable colWidths="1063.0" style="Table7">
+        <blockTable colWidths="785.0" style="Table7">
           <tr>
             <td>
               <para style="terp_tblheader_Details">Allowances with Basic: </para>
@@ -400,7 +446,7 @@
         </blockTable>
         <section>
           <para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
-          <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table6">
+          <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table6">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e1[0] ]]</para>
@@ -471,7 +517,7 @@
             </tr>
           </blockTable>
         </section>
-        <blockTable colWidths="1063.0" style="Table10">
+        <blockTable colWidths="785.0" style="Table10">
           <tr>
             <td>
               <para style="terp_tblheader_Details">Deductions: </para>
@@ -480,7 +526,7 @@
         </blockTable>
         <section>
           <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
-          <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table8">
+          <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table8">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e2[0] ]]</para>
@@ -551,7 +597,7 @@
             </tr>
           </blockTable>
         </section>
-        <blockTable colWidths="1063.0" style="Table11">
+        <blockTable colWidths="785.0" style="Table11">
           <tr>
             <td>
               <para style="terp_tblheader_Details">Others: </para>
@@ -560,7 +606,7 @@
         </blockTable>
         <section>
           <para style="terp_default_1">[[ repeatIn(get_other(),'e3') ]]</para>
-          <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table9">
+          <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table9">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e3[0] ]]</para>
@@ -632,7 +678,7 @@
           </blockTable>
         </section>
       </section>
-      <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table1">
+      <blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table1">
         <tr>
           <td>
             <para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
@@ -679,5 +725,6 @@
         </tr>
       </blockTable>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file

From 2615e28b66d2780fa2ee6120c650c7d43b7091bc Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 22 Nov 2010 13:56:59 +0530
Subject: [PATCH 03/16] [IMP]:hr_payroll:improved report with lanscape size.

bzr revid: apa@tinyerp.com-20101122082659-3lix2jfaytbds80c
---
 .../hr_payroll/report/report_year_report.rml  | 66 +++++++++++++++----
 1 file changed, 55 insertions(+), 11 deletions(-)

diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index d121ce0dd98..4314b91a552 100755
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="Yearly Salary Details.pdf">
-  <template pageSize="(1120.0,770.0)" title="Yearly Salary Details" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(842.0,595.0)" title="Yearly Salary Details" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="1064" height="714"/>
+      <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -137,9 +137,55 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="terp_header_Centre">
-      <font color="white"> </font>
-    </para>
+	<pto>
+	<pto_header>
+	<blockTable colWidths="117.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,57.0" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Name</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total</para>
+          </td>
+        </tr>
+      </blockTable>
+	</pto_header>
     <para style="terp_header_Centre">Yearly Salary Details </para>
     <para style="terp_default_Centre_9">From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]]</para>
     <para style="terp_default_space">
@@ -147,7 +193,7 @@
     </para>
     <section>
       <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
-      <blockTable colWidths="99.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
+      <blockTable colWidths="117.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,57.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Name</para>
@@ -195,7 +241,7 @@
       </blockTable>
       <section>
         <para style="terp_default_1">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
-        <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
+        <blockTable colWidths="117.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,57.0" style="Table1">
           <tr>
             <td>
               <para style="terp_default_9">[[ e[0] ]]</para>
@@ -269,7 +315,7 @@
     </section>
     <section>
       <para style="terp_default_1">[[ repeatIn(get_months_tol(),'t') ]]</para>
-      <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,75.0,74.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
+      <blockTable colWidths="117.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,51.0,57.0" style="Table6">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Total</para>
@@ -315,9 +361,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file

From ea8ed387e25eb956870591583dd1b0d90df90432 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 22 Nov 2010 19:15:01 +0530
Subject: [PATCH 04/16] [IMP]:account:Improved general ledger with rowHeight

bzr revid: apa@tinyerp.com-20101122134501-fnr11wik1vx62qau
---
 .../account_general_ledger_landscape.rml      | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 886f24f1edd..6218a88f556 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -2,7 +2,7 @@
 <document filename="General Ledger.pdf">
   <template pageSize="(842.0,595.0)" title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
+      <frame id="first" x1="28.0" y1="28.0" width="786" height="525"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -246,31 +246,31 @@
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.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="9.0" leading="11" alignment="LEFT" spaceBefore="6.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"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <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_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" 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="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" 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"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <images/>
   </stylesheet>
   <story>
   	<pto>
   	<pto_header>
-  		<blockTable colWidths="45.0,55.0,72.0,64.0,64.0,82.0,80.0,71.0,71.0,88.0,80.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+  		<blockTable colWidths="40.0,56.0,110.0,70.0,70.0,105.0,56.0,70.0,70.0,70.0,70.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
 	      <tr>
 	        <td>
 	          <para style="terp_tblheader_Details">Date</para>
@@ -307,7 +307,7 @@
 	        </td>
 	      </tr>
 	    </blockTable>
-  		<blockTable colWidths="45.0,54.0,85.0,70.0,70.0,135.0,80.0,71.0,71.0,90.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+  		<blockTable colWidths="37.0,54.0,113.0,71.0,71.0,142.0,71.0,71.0,71.0,85.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
 	      <tr>
 	        <td>
 	          <para style="terp_tblheader_Details">Date</para>
@@ -344,6 +344,9 @@
   	</pto_header>
     <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para>
     <para style="terp_header_Centre">General Ledger</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
       <tr>
         <td>
@@ -438,7 +441,7 @@
     <para style="terp_default_8">
        <font color="white"> </font>
     </para>
-    <blockTable colWidths="45.0,55.0,72.0,64.0,64.0,82.0,80.0,71.0,71.0,88.0,80.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+    <blockTable colWidths="40.0,55.0,105.0,70.0,65.0,110.0,55.0,70.0,70.0,77.0,70.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -477,7 +480,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="461.0,71.0,71.0,88.0,80.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+      <blockTable rowHeights="0.55cm" colWidths="501.0,70.0,70.0,77.0,70.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
         <tr>
           <td>
             <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
@@ -498,7 +501,7 @@
       </blockTable>
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
-        <blockTable rowHeights="0.55cm" colWidths="45.0,55.0,72.0,64.0,64.0,82.0,80.0,71.0,71.0,88.0,80.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+        <blockTable rowHeights="0.55cm" colWidths="40.0,55.0,105.0,70.0,65.0,110.0,55.0,70.0,70.0,77.0,70.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
           <tr>
             <td>
               <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
@@ -531,13 +534,13 @@
               <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9"><font size="8.0">[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para>
+              <para style="terp_default_Right_8"><font size="7.0">[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <blockTable colWidths="45.0,54.0,85.0,70.0,70.0,135.0,80.0,71.0,71.0,90.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="37.0,54.0,113.0,71.0,71.0,142.0,71.0,71.0,71.0,85.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -573,7 +576,7 @@
     </blockTable>
     <section>
       <para style="Standard">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="540.0,71.0,71.0,90.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+      <blockTable rowHeights="0.55cm" colWidths="565.0,70.0,70.0,80.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
@@ -591,7 +594,7 @@
       </blockTable>
       <section>
         <para style="Standard">[[ repeatIn(lines(o), 'line') ]]</para>
-        <blockTable rowHeights="0.55cm" colWidths="45.0,54.0,85.0,70.0,70.0,135.0,80.0,71.0,71.0,90.0" style="Table12">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+        <blockTable rowHeights="0.55cm" colWidths="40.0,54.0,118.0,70.0,70.0,144.0,70.0,70.0,70.0,80.0" style="Table12">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
           <tr>
             <td>
               <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>

From 4c8a58015ae2edfc87e5e65dce1b651a21e26f1d Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 22 Nov 2010 17:23:48 +0100
Subject: [PATCH 05/16] [FIX] account, general ledger report: fixed the
 strip_name function

bzr revid: qdp-launchpad@tinyerp.com-20101122162348-paxq56r4wj6mtjqn
---
 addons/account/report/account_general_ledger.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 6ccfb9343a2..4656987cbeb 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -90,15 +90,13 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
         })
         self.context = context
 
-    def _ellipsis(self, orig_str, maxlen=100, ellipsis='...'):
-        maxlen = maxlen - len(ellipsis)
-        if maxlen <= 0:
-            maxlen = 1
-        new_str = orig_str[:maxlen]
-        return new_str
+    def _ellipsis(self, char, size=100, truncation_str='...'):
+        if len(char) <= size:
+            return char
+        return char[:size-len(truncation_str)] + truncation_str
 
     def _strip_name(self, name, maxlen=50):
-        return self._ellipsis(name, maxlen, ' ...')
+        return self._ellipsis(name, maxlen)
 
     def _sum_currency_amount_account(self, account):
         self.cr.execute('SELECT sum(l.amount_currency) AS tot_currency \
@@ -317,4 +315,4 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
 report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/account_general_ledger.rml', parser=general_ledger, header='internal')
 report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/account_general_ledger_landscape.rml', parser=general_ledger, header='internal landscape')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From eae378ac6c468294f956043e8f85e8300bb2ee40 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 23 Nov 2010 10:04:32 +0530
Subject: [PATCH 06/16] [IMP]:account:Improved general ledger

bzr revid: apa@tinyerp.com-20101123043432-9cz3i2ng1m9ifcya
---
 .../account/report/account_general_ledger_landscape.rml   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 6218a88f556..5e2d445f772 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -270,7 +270,7 @@
   <story>
   	<pto>
   	<pto_header>
-  		<blockTable colWidths="40.0,56.0,110.0,70.0,70.0,105.0,56.0,70.0,70.0,70.0,70.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+  		<blockTable colWidths="40.0,50.0,105.0,67.0,65.0,130.0,50.0,70.0,65.0,75.0,70.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
 	      <tr>
 	        <td>
 	          <para style="terp_tblheader_Details">Date</para>
@@ -441,7 +441,7 @@
     <para style="terp_default_8">
        <font color="white"> </font>
     </para>
-    <blockTable colWidths="40.0,55.0,105.0,70.0,65.0,110.0,55.0,70.0,70.0,77.0,70.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+    <blockTable colWidths="40.0,50.0,105.0,67.0,65.0,130.0,50.0,70.0,65.0,75.0,70.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -480,7 +480,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="501.0,70.0,70.0,77.0,70.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+      <blockTable rowHeights="0.55cm" colWidths="508.0,70.0,65.0,75.0,70.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
         <tr>
           <td>
             <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
@@ -501,7 +501,7 @@
       </blockTable>
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
-        <blockTable rowHeights="0.55cm" colWidths="40.0,55.0,105.0,70.0,65.0,110.0,55.0,70.0,70.0,77.0,70.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+        <blockTable rowHeights="0.55cm" colWidths="40.0,50.0,105.0,67.0,65.0,130.0,50.0,70.0,65.0,75.0,70.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
           <tr>
             <td>
               <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>

From e4b1403e441dc59bb4038c141799efe5df03c90d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 23 Nov 2010 17:45:11 +0530
Subject: [PATCH 07/16] [IMP]:account:improved for strip_name function and add
 rowHeight.

bzr revid: apa@tinyerp.com-20101123121511-31jkgmx1kpv22f78
---
 addons/account/report/account_general_ledger.py        | 9 ---------
 addons/account/report/account_general_ledger.rml       | 8 ++++----
 addons/account/report/account_partner_ledger.rml       | 9 ++++-----
 addons/account/report/account_partner_ledger_other.rml | 8 ++++----
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 4656987cbeb..891d9ec92b3 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -86,18 +86,9 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
             'get_target_move': self._get_target_move,
-            'strip_name': self._strip_name,
         })
         self.context = context
 
-    def _ellipsis(self, char, size=100, truncation_str='...'):
-        if len(char) <= size:
-            return char
-        return char[:size-len(truncation_str)] + truncation_str
-
-    def _strip_name(self, name, maxlen=50):
-        return self._ellipsis(name, maxlen)
-
     def _sum_currency_amount_account(self, account):
         self.cr.execute('SELECT sum(l.amount_currency) AS tot_currency \
                 FROM account_move_line l \
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 78a5fd35a46..fb37c9bea42 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -274,10 +274,10 @@
      </blockTable>
       <section>
      <para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-     <blockTable colWidths="45.0,60.0,60.0,60.0,65.0,85.0,84.0,86.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+     <blockTable rowHeights="0.55cm" colWidths="45.0,60.0,60.0,60.0,65.0,85.0,84.0,86.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
-          <blockTable colWidths="245.0,40.0,84.0,86.0,84.0" style="Table5">
+          <blockTable rowHeights="0.55cm" colWidths="245.0,40.0,84.0,86.0,84.0" style="Table5">
       <tr>
         <td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code or '']] [[ o.name or '']]</para></td>
         <td><para style="Standard"></para></td>
@@ -323,10 +323,10 @@
      </blockTable>
      <section>
      <para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-     <blockTable colWidths="45.0,45.0,55.0,60.0,60.0,62.5,62.5,77.5,77.5" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+     <blockTable rowHeights="0.55cm" colWidths="45.0,45.0,55.0,60.0,60.0,62.5,62.5,77.5,77.5" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
        <tr>
           <td>
-          <blockTable colWidths="230.0,30.0,62.5,62.5,77.5,77.5" style="Table5">
+          <blockTable rowHeights="0.55cm" colWidths="230.0,30.0,62.5,62.5,77.5,77.5" style="Table5">
               <tr>
                 <td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code or '' ]] [[ o.name or '' ]]</para></td>
                 <td><para style="Standard"></para></td>
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 96c0612d234..872fc5e0b19 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -373,7 +373,7 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable rowHeights="0.55cm" colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -409,7 +409,7 @@
     </para>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+      <blockTable rowHeights="0.55cm" colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -478,7 +478,7 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+    <blockTable rowHeights="0.55cm" colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -522,7 +522,7 @@
     </para>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+      <blockTable rowHeights="0.55cm" colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -557,7 +557,6 @@
         <font color="white"> </font>
       </para>
     </section>
-
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 24ac80dfc38..018152111e0 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -524,7 +524,7 @@
     </blockTable>
   <section>
   <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
-    <blockTable colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable rowHeights="0.55cm" colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -557,7 +557,7 @@
     </blockTable>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+      <blockTable rowHeights="0.55cm" colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -621,7 +621,7 @@
     <para style="P4"/>
     <section>
     <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
-    <blockTable colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+    <blockTable rowHeights="0.55cm" colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -661,7 +661,7 @@
     </blockTable>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+      <blockTable rowHeights="0.55cm" colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3"> [[ formatLang(line['date'],date=True) ]]</para>

From 72f15ed46027a1541258b9cded5b9791a6c43adc Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 24 Nov 2010 15:45:29 +0530
Subject: [PATCH 08/16] [IMP]:account:Improved Partner Ledger (On Partner Per
 Page) for good alignment and also used strip_name function with same as sxw
 file.

bzr revid: apa@tinyerp.com-20101124101529-utytr9rq95no13fn
---
 .../account/report/account_partner_ledger.rml | 904 +++++++++---------
 1 file changed, 466 insertions(+), 438 deletions(-)

diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 872fc5e0b19..a95535bff54 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -2,7 +2,7 @@
 <document filename="Partner Ledger.pdf">
   <template pageSize="(595.0,842.0)" title="Partner Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="772"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,11 +10,153 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_header">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" 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="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_header_1">
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" 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="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="10,0" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="13,0" stop="13,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,3" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,3" stop="1,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,4" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,4" stop="0,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,4" stop="1,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table9">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -26,71 +168,32 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-2"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <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="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
-    </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <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"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/>
     </blockTableStyle>
-   <blockTableStyle id="Table3_header">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
-        <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-     <blockTableStyle id="Table4">
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -103,463 +206,388 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table6">
+    <blockTableStyle id="Table12">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-2"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table5">
+    <blockTableStyle id="Table13">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table7">
+    <blockTableStyle id="Table14">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <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"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <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="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" 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="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.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="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.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="9.0" leading="11" alignment="LEFT" spaceBefore="6.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"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <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_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" 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="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Left_9" fontName="Helvetica" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0" />
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" 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"/>
+    <paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_balance" fontName="Helvetica" fontSize="8.0" leading="0" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-  <pto>
-  <pto_header>
-  <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <para style="terp_default_8">[[ repeatIn(objects, 'p') ]]</para>
+    <para style="terp_default_8">[[ setLang(p.lang) ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header_Centre">Partner Ledger</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Date</para>
+          <para style="terp_tblheader_General_Centre">Chart of Account</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">JNRL</para>
+          <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
+          <para style="terp_tblheader_General_Centre">Journal</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Account</para>
+          <para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Entry Label</para>
+          <para style="terp_tblheader_General_Centre">Partner's</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_General_Centre">Target Moves</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table4">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Date</para>
+          <para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">JNRL</para>
+          <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
+          <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Entry Label</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-         <td>
-          <para style="terp_tblheader_Details_Right">Currency</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
-      <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="539.0" style="Table_header">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Partner Ledger</para>
-        </td>
-        <tr>
-          <td>
-            <para style="P4">
-      <font color="white"> </font>
-    </para>
-        </td>
-        </tr>
-      </tr>
-    </blockTable>
-        <para style="P4">
-      <font color="white"> </font>
-    </para>
-        <para style="P4">
-      <font color="white"> </font>
-    </para>
-    <para style="P4">
-      <font color="white"> </font>
-    </para>
-      <para style="P4">
-      <font color="white"> </font>
-    </para>
-      <para style="P4">
-      <font color="white"> </font>
-    </para>
-          <para style="P4">
-      <font color="white"> </font>
-    </para>
-      <para style="P4">
-      <font color="white"> </font>
-    </para>
-          <para style="P4">
-      <font color="white"> </font>
-    </para>
-      <para style="P4">
-      <font color="white"> </font>
-    </para>
-          <para style="P4">
-      <font color="white"> </font>
-    </para>
-    <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
-      <blockTable colWidths="80.0,80.0,80.0,130.0,70.0,80.0" style="Table2_header">
-      <tr>
-        <td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
-        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-    <td><para style="terp_tblheader_General_Centre">Journal</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
-         <td><para style="terp_tblheader_General_Centre">Partner's</para></td>
-        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
-      </tr>
-  <tr>
-     <td><para style="terp_default_Centre_8">[[ get_account(data) or ''  ]]</para></td>
-       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
-    <td><para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-          <blockTable colWidths="60.0,60.0" style="Table3_header">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-        <tr>
-                 <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-              <td><para style="terp_tblheader_General_Centre">End Date</para></td>
-            </tr>
+          <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
+          <blockTable colWidths="58.0,58.0" style="Table7">
             <tr>
-              <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
+              <td>
+                <para style="terp_tblheader_General_Centre">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] Start Date</para>
+              </td>
+              <td>
+                <para style="terp_tblheader_General_Centre">End Date</para>
+              </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="65.0,65.0" style="Table3_header">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-        <tr>
-              <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-              <td><para style="terp_tblheader_General_Centre">End Period</para></td>
-            </tr>
+          <blockTable colWidths="58.0,58.0" style="Table9">
             <tr>
-              <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
+              <td>
+                <para style="terp_default_Centre_8">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] [[ formatLang(get_start_date(data),date=True) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
+              </td>
             </tr>
-           </blockTable>
-          </td>
-  <td><para style="terp_default_Centre_8">[[ get_partners() ]]</para></td>
-  <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
-  </tr>
-  </blockTable>
-     <para style="P4">
-      <font color="white"> </font>
-    </para>
-        <para style="P4">
-      <font color="white"> </font>
-    </para>
-            <para style="P4">
-      <font color="white"> </font>
-    </para>
-       <para style="P4">
-      <font color="white"> </font>
-    </para>
-      <para style="P4">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">JNRL</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Entry Label</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P4">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <blockTable rowHeights="0.55cm" colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-
-      <tr>
-        <td>
-          <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
-        </td>
-        <td>
-          <para style="P5"><u>[[ formatLang((sum_debit_partner(p))) ]]</u></para>
-        </td>
-        <td>
-          <para style="P5"><u>[[ formatLang((sum_credit_partner(p))) ]]</u></para>
-        </td>
-        <td>
-          <para style="P5"><u>[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</u></para>
-        </td>
-      </tr>
-       <tr>
-      <td>[[ data['form']['initial_balance'] or  removeParentNode('tr') ]]
-          <para style="terp_default_Left_9">Initial Balance</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-    </tr>
-    </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-        <tr>
-          <td>
-            <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
-          </td>
-          <td>
-            <para style="P3">[[ line['code'] ]]</para>
-          </td>
-          <td>
-            <para style="P3">[[ line['move_name'] ]]</para>
-          </td>
-          <td>
-            <para style="P3">[[ line['a_code'] ]]</para>
-          </td>
-          <td>
-            <para style="P3">[[ line['ref'] ]] - [[ line['name'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
-    </section>
-     <blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">JNRL</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Entry Label</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-         <td>
-          <para style="terp_tblheader_Details_Right">Currency</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P4">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <blockTable rowHeights="0.55cm" colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-
-      <tr>
-        <td>
-          <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-        <td>
-          <para style="P5">
+          </blockTable>
+          <blockTable colWidths="58.0,58.0" style="Table10">
+            <tr>
+              <td>
+                <para style="terp_tblheader_General_Centre">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] Start Period</para>
+              </td>
+              <td>
+                <para style="terp_tblheader_General_Centre">End Period</para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="58.0,58.0" style="Table11">
+            <tr>
+              <td>
+                <para style="terp_default_Centre_8">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] [[ get_start_period(data) or removeParentNode('para') ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_partners() ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
+        </td>
       </tr>
-      <tr>
-        <td>[[display_initial_balance(data) or  removeParentNode('tr') ]]
-          <para style="terp_default_Left_9">Initial Balance</para>
-        </td>
-         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-       <td>
-          <para style="P5"></para>
-        </td>
-    </tr>
     </blockTable>
-    <para style="terp_default_2">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <section>
-      <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+      <para style="terp_default_2">
+        <font face="Helvetica" color="white">[[ display_currency(data) == False or removeParentNode('section') ]]</font>
+      </para>
+      <blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
         <tr>
           <td>
-            <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
+            <para style="terp_tblheader_Details">Date</para>
           </td>
           <td>
-            <para style="P3">[[ line['code'] ]]</para>
+            <para style="terp_tblheader_Details">JNRL</para>
           </td>
           <td>
-            <para style="P3">[[ line['move_name'] ]]</para>
+            <para style="terp_tblheader_Details_Centre">Ref</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
+            <para style="terp_tblheader_Details_Centre">Account</para>
           </td>
           <td>
-            <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
+            <para style="terp_tblheader_Details">Entry Label</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+            <para style="terp_tblheader_Details_Right">Debit</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+            <para style="terp_tblheader_Details_Right">Credit</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para>
+            <para style="terp_tblheader_Details_Right">Balance</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
+      <blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table3">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p))) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="terp_default_2">
+          <font face="Helvetica" color="white">[[data['form']['initial_balance']==True or removeParentNode('section') ]]</font>
+        </para>
+        <blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table5">
+          <tr>
+            <td>
+              <para style="terp_default_9">Initial Balance</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+      <section>
+        <para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
+        <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table6">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ line['code'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+    </section>
+    <section>
+      <para style="terp_default_2">
+        <font face="Helvetica" color="white">[[ display_currency(data) == True or removeParentNode('section') ]]</font>
+      </para>
+      <blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Date</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">JNRL</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Ref</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Account</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Entry Label</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Debit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Credit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Balance</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Currency</para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table12">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p))) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="terp_default_2"><font color="white">[[ data['form']['initial_balance']==True or removeParentNode('section') ]]</font></para>
+        <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table13">
+          <tr>
+            <td>
+              <para style="terp_default_9">Initial Balance</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">
+                <font color="white"> </font>
+              </para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+      <section>
+        <para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
+        <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table14">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ line['code'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ strip_name(line['ref'],5) ]] - [[ strip_name(line['name'],5) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="8.0">[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font>
+              </para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
     </section>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    </pto>
   </story>
-</document>
+</document>
\ No newline at end of file

From 154c9eb89e0824e54761c9efc141902cac2e381c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 24 Nov 2010 16:21:28 +0530
Subject: [PATCH 09/16] [IMP]:account:added <pto> tag for repeat the column on
 each page.(Partner Ledger)

bzr revid: apa@tinyerp.com-20101124105128-hf3eeyhnq5o54wwl
---
 .../account/report/account_partner_ledger.rml | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index a95535bff54..309ea0fbe33 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -272,6 +272,70 @@
     <images/>
   </stylesheet>
   <story>
+  	<pto>
+  	<pto_header>
+  		<blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
+  			[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+	        <tr>
+	          <td>
+	            <para style="terp_tblheader_Details">Date</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details">JNRL</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Centre">Ref</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Centre">Account</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details">Entry Label</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Debit</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Credit</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Balance</para>
+	          </td>
+	        </tr>
+	      </blockTable>
+  		<blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
+  			[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+	        <tr>
+	          <td>
+	            <para style="terp_tblheader_Details">Date</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details">JNRL</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Centre">Ref</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Centre">Account</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details">Entry Label</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Debit</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Credit</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Balance</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Currency</para>
+	          </td>
+	        </tr>
+	      </blockTable>
+  	</pto_header>
     <para style="terp_default_8">[[ repeatIn(objects, 'p') ]]</para>
     <para style="terp_default_8">[[ setLang(p.lang) ]]</para>
     <para style="terp_default_8">
@@ -589,5 +653,6 @@
         </blockTable>
       </section>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file

From 597e93e20fb8bdf9262ec60b97c5c4b8d1bfe580 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 24 Nov 2010 16:38:02 +0530
Subject: [PATCH 10/16] [IMP]:account:Improved Partner Ledger other for good
 alignment and also used strip_name function

bzr revid: apa@tinyerp.com-20101124110802-i553clyzkszy3s4v
---
 .../report/account_partner_ledger_other.rml   | 1067 ++++++++---------
 1 file changed, 515 insertions(+), 552 deletions(-)

diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 018152111e0..169f5083e98 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -2,7 +2,7 @@
 <document filename="Partner Ledger.pdf">
   <template pageSize="(595.0,842.0)" title="Partner Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="772"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,196 +10,153 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_header">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <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="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="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="9,0" stop="9,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="10,0" stop="10,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="11,0" stop="11,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="11,0" stop="11,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="12,0" stop="12,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="12,0" stop="12,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="12,0" stop="12,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="13,0" stop="13,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="14,0" stop="14,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="14,0" stop="14,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="14,-1" stop="14,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="15,0" stop="15,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="15,0" stop="15,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="15,-1" stop="15,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="16,0" stop="16,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="16,0" stop="16,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="16,0" stop="16,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="16,-1" stop="16,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="17,0" stop="17,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="17,-1" stop="17,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="18,0" stop="18,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="18,0" stop="18,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="18,-1" stop="18,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="19,0" stop="19,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="19,-1" stop="19,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="20,0" stop="20,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="20,0" stop="20,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="20,-1" stop="20,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,1" stop="0,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,1" stop="1,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,1" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,1" stop="2,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,1" stop="3,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,1" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,1" stop="4,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,1" stop="5,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,1" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,1" stop="5,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,2" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,2" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,2" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,2" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,2" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,2" stop="4,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,2" stop="5,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,2" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,2" stop="5,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,2" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,2" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,2" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,2" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,2" stop="8,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="9,2" stop="9,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="9,2" stop="9,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="9,2" stop="9,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="10,2" stop="10,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="11,2" stop="11,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="11,2" stop="11,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="12,2" stop="12,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="13,2" stop="13,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="13,2" stop="13,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,3" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,3" stop="0,3"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,3" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,3" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,3" stop="1,3"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,4" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,4" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,4" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,5" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,5" stop="0,5"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,5" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,5" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,5" stop="1,5"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,6" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,6" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,6" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" 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="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table8">
+    <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <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="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" 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="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="10,0" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="13,0" stop="13,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,3" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,3" stop="1,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,4" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,4" stop="0,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,4" stop="1,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_header">
+    <blockTableStyle id="Table11">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_header_1">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -211,32 +168,32 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0, 0" stop="0,-2"/>
-    </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <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"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -249,454 +206,460 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table5">
+    <blockTableStyle id="Table12">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table6">
+    <blockTableStyle id="Table13">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table7">
+    <blockTableStyle id="Table14">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <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"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <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="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
     <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.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="9.0" leading="11" alignment="LEFT" spaceBefore="6.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"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <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_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" 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="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Left_9" fontName="Helvetica" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0" />
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" 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"/>
+    <paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Table index 1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica"/>
-    <paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Table index heading" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="16.0" leading="20" spaceBefore="12.0" spaceAfter="6.0"/>
-  <paraStyle name="terp_default_Right_1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <images/>
   </stylesheet>
   <story>
-  <pto>
-  <pto_header>
-  <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+  	<pto>
+  	<pto_header>
+  		<blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
+  			[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+	        <tr>
+	          <td>
+	            <para style="terp_tblheader_Details">Date</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details">JNRL</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Centre">Ref</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Centre">Account</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details">Entry Label</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Debit</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Credit</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Balance</para>
+	          </td>
+	        </tr>
+	      </blockTable>
+  		<blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
+  			[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+	        <tr>
+	          <td>
+	            <para style="terp_tblheader_Details">Date</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details">JNRL</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Centre">Ref</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Centre">Account</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details">Entry Label</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Debit</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Credit</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Balance</para>
+	          </td>
+	          <td>
+	            <para style="terp_tblheader_Details_Right">Currency</para>
+	          </td>
+	        </tr>
+	      </blockTable>
+  	</pto_header>
+
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header_Centre">Partner Ledger</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Date</para>
+          <para style="terp_tblheader_General_Centre">Chart of Account</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">JNRL</para>
+          <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
+          <para style="terp_tblheader_General_Centre">Journal</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Account</para>
+          <para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Entry Label</para>
+          <para style="terp_tblheader_General_Centre">Partner's</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_General_Centre">Target Moves</para>
         </td>
       </tr>
     </blockTable>
-<blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table4">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Date</para>
+          <para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">JNRL</para>
+          <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
+          <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Entry Label</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Currency</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
-    <blockTable colWidths="539.0" style="Table_header">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Partner Ledger</para>
-        </td>
-        <tr>
-          <td>
-            <para style="P4">
-      <font color="white"> </font>
-    </para>
-        </td>
-        </tr>
-      </tr>
-      </blockTable>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-     <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-          <blockTable colWidths="85.0,79.0,90.0,130.0,65.0,90.0" style="Table8">
+          <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
+          <blockTable colWidths="58.0,58.0" style="Table7">
             <tr>
               <td>
-                <para style="P9">Chart of Account</para>
+                <para style="terp_tblheader_General_Centre">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] Start Date</para>
               </td>
               <td>
-                <para style="P9">Fiscal Year</para>
-              </td>
-              <td>
-                <para style="P9">Journal</para>
-              </td>
-              <td>
-                <para style="P9">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
-              </td>
-              <td>
-                <para style="P9">Partner's</para>
-              </td>
-              <td>
-                <para style="P9">Target Moves</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P11">[[ get_account(data) or '' ]]</para>
-              </td>
-              <td>
-                <para style="P11">[[ get_fiscalyear(data) or '' ]]</para>
-              </td>
-               <td><para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-                <blockTable colWidths="65.0,60.0" style="Table9">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-                  <tr>
-                    <td>
-                      <para style="P8">Start Date</para>
-                    </td>
-                    <td>
-                      <para style="P8">End Date</para>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>
-                      <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
-                    </td>
-                    <td>
-                      <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
-                    </td>
-                  </tr>
-                </blockTable>
-                <blockTable colWidths="65.0,60.0" style="Table10">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-                  <tr>
-                    <td>
-                      <para style="P12">Start Period</para>
-                    </td>
-                    <td>
-                      <para style="P12">End Period</para>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>
-                      <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
-                    </td>
-                    <td>
-                      <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
-                    </td>
-                  </tr>
-                </blockTable>
-              </td>
-              <td>
-                <para style="terp_default_Centre_8">[[ get_partners() ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
+                <para style="terp_tblheader_General_Centre">End Date</para>
               </td>
             </tr>
           </blockTable>
-         <para style="P5">
+          <blockTable colWidths="58.0,58.0" style="Table9">
+            <tr>
+              <td>
+                <para style="terp_default_Centre_8">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] [[ formatLang(get_start_date(data),date=True) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="58.0,58.0" style="Table10">
+            <tr>
+              <td>
+                <para style="terp_tblheader_General_Centre">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] Start Period</para>
+              </td>
+              <td>
+                <para style="terp_tblheader_General_Centre">End Period</para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="58.0,58.0" style="Table11">
+            <tr>
+              <td>
+                <para style="terp_default_Centre_8">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] [[ get_start_period(data) or removeParentNode('para') ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-                   <para style="P5">
-            <font color="white"> </font>
-          </para>
-    <blockTable colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">JNRL</para>
+          <para style="terp_default_Centre_8">[[ get_partners() ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Entry Label</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
         </td>
       </tr>
     </blockTable>
-  <section>
-  <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
-    <blockTable rowHeights="0.55cm" colWidths="329.0,70.0,70.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-
-      <tr>
-        <td>
-          <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-      </tr>
-      <tr>
-    <td>[[ display_initial_balance(data)  or  removeParentNode('tr') ]]
-          <para style="terp_default_Left_9">Initial Balance</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-    </tr>
-    </blockTable>
-    <section>
-      <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="50.0,50.0,70.0,50.0,109.0,70.0,70.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
+    [[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
-            <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
+            <para style="terp_tblheader_Details">Date</para>
           </td>
           <td>
-            <para style="P3">[[ line['code'] ]]</para>
+            <para style="terp_tblheader_Details">JNRL</para>
           </td>
           <td>
-            <para style="P3">[[ line['move_name'] ]]</para>
+            <para style="terp_tblheader_Details_Centre">Ref</para>
           </td>
           <td>
-            <para style="P3">[[ line['a_code'] ]]</para>
+            <para style="terp_tblheader_Details_Centre">Account</para>
           </td>
           <td>
-            <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
+            <para style="terp_tblheader_Details">Entry Label</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+            <para style="terp_tblheader_Details_Right">Debit</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+            <para style="terp_tblheader_Details_Right">Credit</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">Balance</para>
           </td>
         </tr>
       </blockTable>
-    </section>
-    </section>
-    <blockTable colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">JNRL</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Entry Label</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Currency</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P4"/>
     <section>
-    <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
-    <blockTable rowHeights="0.55cm" colWidths="260.0,65.0,65.0,80.0,80.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-      <tr>
-        <td>
-          <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_credit_partner(p))) ]]</para>
-        </td>
-        <td>
-          <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-        <td>
-          <para style="P5">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-        <tr>
-        <td>[[ data['form']['initial_balance'] or  removeParentNode('tr') ]]
-         <para style="terp_default_Left_9">Initial Balance</para>
-        </td>
-         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]] </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
-        </td>
-       <td>
-          <para style="terp_default_Right_9"></para>
-        </td>
-        </tr>
-    </blockTable>
-    <section>
-      <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="50.0,40.0,60.0,50.0,60.0,65.0,65.0,80.0,80.0" style="Table7">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-        <tr>
-          <td>
-            <para style="P3"> [[ formatLang(line['date'],date=True) ]]</para>
-          </td>
-          <td>
-            <para style="P3">[[ line['code'] ]]</para>
-          </td>
-          <td>
-            <para style="P3">[[ line['move_name'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
-          </td>
-          <td>
-            <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para>
-          </td>
-        </tr>
-      </blockTable>
-      </section>
+      <para style="terp_default_8">[[ repeatIn(objects, 'p') ]]</para>
+      <para style="terp_default_8">[[ setLang(p.lang) ]]</para>
       <para style="terp_default_2">
-        <font color="white"> </font>
+        <font face="Helvetica" color="white">[[ display_currency(data) == False or removeParentNode('section') ]]</font>
       </para>
+
+      <blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table3">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p))) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="terp_default_2">
+          <font face="Helvetica" color="white">[[data['form']['initial_balance']==True or removeParentNode('section') ]]</font>
+        </para>
+        <blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table5">
+          <tr>
+            <td>
+              <para style="terp_default_9">Initial Balance</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+      <section>
+        <para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
+        <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table6">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ line['code'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+    </section>
+    <blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
+    [[ display_currency(data) == True or removeParentNode('blockTable') ]]
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Date</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">JNRL</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Ref</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Account</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Entry Label</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Debit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Credit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Balance</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Currency</para>
+          </td>
+        </tr>
+      </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(objects, 'p') ]]</para>
+      <para style="terp_default_8">[[ setLang(p.lang) ]]</para>
+      <para style="terp_default_2">
+        <font face="Helvetica" color="white">[[ display_currency(data) == True or removeParentNode('section') ]]</font>
+      </para>
+
+      <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table12">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p))) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_credit_partner(p))) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="terp_default_2"><font color="white">[[ data['form']['initial_balance']==True or removeParentNode('section') ]]</font></para>
+        <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table13">
+          <tr>
+            <td>
+              <para style="terp_default_9">Initial Balance</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">
+                <font color="white"> </font>
+              </para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+      <section>
+        <para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
+        <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table14">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ line['code'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ strip_name(line['ref'],5) ]] - [[ strip_name(line['name'],5) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="8.0">[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font>
+              </para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
     </section>
     </pto>
   </story>
-</document>
+</document>
\ No newline at end of file

From 0ade2b57d577d241b5ef0cefc7655d140d55618c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 24 Nov 2010 17:04:26 +0530
Subject: [PATCH 12/16] [IMP]:account:Improved Partner Ledger reports.

bzr revid: apa@tinyerp.com-20101124113426-vlvgqrpkdaec4roy
---
 addons/account/report/account_partner_ledger.rml | 16 ++++++++--------
 .../report/account_partner_ledger_other.rml      | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 309ea0fbe33..1a32bc13bde 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -380,40 +380,40 @@
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
-          <blockTable colWidths="58.0,58.0" style="Table7">
+          <blockTable colWidths="58.0,58.0" style="Table7">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
-                <para style="terp_tblheader_General_Centre">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] Start Date</para>
+                <para style="terp_tblheader_General_Centre">Start Date</para>
               </td>
               <td>
                 <para style="terp_tblheader_General_Centre">End Date</para>
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table9">
+          <blockTable colWidths="58.0,58.0" style="Table9">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
-                <para style="terp_default_Centre_8">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] [[ formatLang(get_start_date(data),date=True) ]]</para>
+                <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
               </td>
               <td>
                 <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table10">
+          <blockTable colWidths="58.0,58.0" style="Table10">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
             <tr>
               <td>
-                <para style="terp_tblheader_General_Centre">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] Start Period</para>
+                <para style="terp_tblheader_General_Centre">Start Period</para>
               </td>
               <td>
                 <para style="terp_tblheader_General_Centre">End Period</para>
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table11">
+          <blockTable colWidths="58.0,58.0" style="Table11">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
             <tr>
               <td>
-                <para style="terp_default_Centre_8">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] [[ get_start_period(data) or removeParentNode('para') ]]</para>
+                <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
               </td>
               <td>
                 <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 169f5083e98..b3dec993cdb 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -379,40 +379,40 @@
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
-          <blockTable colWidths="58.0,58.0" style="Table7">
+          <blockTable colWidths="58.0,58.0" style="Table7">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
-                <para style="terp_tblheader_General_Centre">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] Start Date</para>
+                <para style="terp_tblheader_General_Centre">Start Date</para>
               </td>
               <td>
                 <para style="terp_tblheader_General_Centre">End Date</para>
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table9">
+          <blockTable colWidths="58.0,58.0" style="Table9">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
-                <para style="terp_default_Centre_8">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] [[ formatLang(get_start_date(data),date=True) ]]</para>
+                <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
               </td>
               <td>
                 <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table10">
+          <blockTable colWidths="58.0,58.0" style="Table10">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
             <tr>
               <td>
-                <para style="terp_tblheader_General_Centre">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] Start Period</para>
+                <para style="terp_tblheader_General_Centre">Start Period</para>
               </td>
               <td>
                 <para style="terp_tblheader_General_Centre">End Period</para>
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table11">
+          <blockTable colWidths="58.0,58.0" style="Table11">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
             <tr>
               <td>
-                <para style="terp_default_Centre_8">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] [[ get_start_period(data) or removeParentNode('para') ]]</para>
+                <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
               </td>
               <td>
                 <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>

From 6ab52ca29ce1dee3f82e266dbcd72e80bf07714d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 24 Nov 2010 19:02:59 +0530
Subject: [PATCH 13/16] [IMP]:account:Improved General Ledger (Non Landscape)
 for good alignment and also used strip_name function and also same as sxw
 file.

bzr revid: apa@tinyerp.com-20101124133259-3t3yy0zce40tlag1
---
 .../account/report/account_general_ledger.rml | 895 +++++++++++-------
 1 file changed, 578 insertions(+), 317 deletions(-)

diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index fb37c9bea42..ae47873a294 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -2,363 +2,624 @@
 <document filename="General Ledger.pdf">
   <template pageSize="(595.0,842.0)" title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="772"/>
     </pageTemplate>
   </template>
-   <stylesheet>
-    <blockTableStyle id="tbl_header">
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Company_Name">
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="tbl_content">
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Subheader_Content_detail">
+    <blockTableStyle id="Table13">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <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="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" 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="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Sub_Header_Content">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <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="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="8,0" stop="8,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,0"/>
-      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" 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="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="8,0" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="10,0" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="13,0" stop="13,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,3" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,3" stop="1,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,4" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,4" stop="0,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,4" stop="1,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <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="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-     <blockTableStyle id="Table3">
+    <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table9">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="8.3" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="date" fontName="Helvetica-Bold" fontSize="8.3" leading="10" spaceBefore="0.0" spaceAfter="6.0" alignment="LEFT"/>
-    <paraStyle name="P2_content" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3b" fontName="Helvetica-Bold" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3_centre" fontName="Helvetica" fontSize="8.3" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="8.3" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4_content" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P9b" fontName="Helvetica-Bold" fontSize="8.5" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="14.0" leading="17"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="10.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P15" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P16" rightIndent="17.0" leftIndent="-0.0" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P17" fontName="Helvetica" alignment="LEFT" fontSize="12.0"  spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Helvetica-Bold" fontSize="8.5"/>
-    <paraStyle name="Account" fontName="Helvetica"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <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="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
-  <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.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_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.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="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <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_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" 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="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.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_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
   <story>
-  <pto>
-  <pto_header>
-  <blockTable colWidths="45.0,60.0,60.0,60.0,65.0,85.0,85.0,85.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
-        <tr>
-          <td><para style="date">Date</para></td>
-          <td><para style="P3b">Partner</para></td>
-          <td><para style="terp_tblheader_Details_Centre">Ref</para></td>
-          <td><para style="terp_tblheader_Details_Centre">Move</para></td>
-          <td><para style="P3b">Entry Label</para></td>
-          <td><para style="P9b">Debit</para></td>
-          <td><para style="P9b">Credit</para></td>
-          <td><para style="P9b">Balance</para></td>
-        </tr>
-     </blockTable>
-     <blockTable colWidths="45.0,45.0,55.0,60.0,60.0,62.5,62.5,77.5,77.5" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
-        <tr>
-          <td><para style="date">Date</para></td>
-          <td><para style="P3b">Partner</para></td>
-          <td><para style="terp_tblheader_Details_Centre">Ref</para></td>
-          <td><para style="terp_tblheader_Details_Centre">Move</para></td>
-          <td><para style="P3b">Entry Label</para></td>
-          <td><para style="P9b">Debit</para></td>
-          <td><para style="P9b">Credit</para></td>
-          <td><para style="P9b">Balance</para></td>
-          <td><para style="P9b">Currency</para></td>
-        </tr>
-     </blockTable>
-  </pto_header>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
+  	<pto>
+  	<pto_header>
+  		<blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+	      <tr>
+	        <td>
+	          <para style="terp_tblheader_Details">Date</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details">JNRL</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details">Partner</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Centre">Ref</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Centre">Move</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details">Entry Label</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Centre">Counterpart</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Right">Debit</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Right">Credit</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Right">Balance</para>
+	        </td>
+	      </tr>
+	    </blockTable>
+	    <blockTable colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+	      <tr>
+	        <td>
+	          <para style="terp_tblheader_Details">Date</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details">JNRL</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details">Partner</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Centre">Ref</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Centre">Move</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details">Entry Label</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Centre">Counterpart</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Right">Debit</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Right">Credit</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Right">Balance</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details_Right">Currency</para>
+	        </td>
+	      </tr>
+	    </blockTable>
+  	</pto_header>
+    <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para>
+    <para style="terp_header_Centre">General Ledger</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table13">
       <tr>
         <td>
-          <para style="terp_header_Centre">General Ledger</para>
+          <para style="terp_tblheader_General_Centre">Chart of Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Fiscal Year</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Journal</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Partner's</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Target Moves</para>
         </td>
       </tr>
     </blockTable>
-    <para>
-      <font color="white"> </font>
-    </para>
-   <para>[[ repeatIn(objects, 'a') ]]</para>
-    <blockTable colWidths="80.0,70.0,70.0,80.0,100.0,70.0,80.0" style="Table2">
+    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1">
       <tr>
-        <td><para style="terp_tblheader_General_Centre">Chart of Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-    <td><para style="terp_tblheader_General_Centre">Journals</para></td>
-    <td><para style="terp_tblheader_General_Centre">Display Account </para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
-         <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td>
-        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
-      </tr>
-  <tr>
-     <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
-       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-    <td> <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]] </para></td>
-    <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-          <blockTable colWidths="50.0,50.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-        <tr>
-                 <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-              <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
-            </tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
+          <blockTable colWidths="58.0,58.0" style="Table2">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
             <tr>
-             <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
+              <td>
+                <para style="terp_tblheader_General_Centre">Start Date</para>
+              </td>
+              <td>
+                <para style="terp_tblheader_General_Centre">End Date</para>
+              </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="50.0,50.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-        <tr>
-              <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-              <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
-            </tr>
+          <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
             <tr>
-              <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
+              <td>
+                <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
+              </td>
             </tr>
-           </blockTable>
-          </td>
-        <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
-  <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
-  </tr>
-  </blockTable>
-
-    <para>
-      <font color="white"> </font>
-    </para>
-    <para>
-      <font color="white"> </font>
-    </para>
-
-   <blockTable colWidths="45.0,60.0,60.0,60.0,65.0,85.0,85.0,85.0" style="tbl_header" repeatRows="1">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
-        <tr>
-          <td><para style="date">Date</para></td>
-          <td><para style="P3b">Partner</para></td>
-          <td><para style="terp_tblheader_Details_Centre">Ref</para></td>
-          <td><para style="terp_tblheader_Details_Centre">Move</para></td>
-          <td><para style="P3b">Entry Label</para></td>
-          <td><para style="P9b">Debit</para></td>
-          <td><para style="P9b">Credit</para></td>
-          <td><para style="P9b">Balance</para></td>
-        </tr>
-     </blockTable>
-      <section>
-     <para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-     <blockTable rowHeights="0.55cm" colWidths="45.0,60.0,60.0,60.0,65.0,85.0,84.0,86.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
-        <tr>
-          <td>
-          <blockTable rowHeights="0.55cm" colWidths="245.0,40.0,84.0,86.0,84.0" style="Table5">
-      <tr>
-        <td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code or '']] [[ o.name or '']]</para></td>
-        <td><para style="Standard"></para></td>
-        <td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o)) ]]</u></para></td>
-        <td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o)) ]] </u></para></td>
-        <td><para style="P9b"><u>[[ formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
+          </blockTable>
+          <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+            <tr>
+              <td>
+                <para style="terp_tblheader_General_Centre">Start Period</para>
+              </td>
+              <td>
+                <para style="terp_tblheader_General_Centre">End Period</para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="58.0,58.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+            <tr>
+              <td>
+                <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_partners() ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
+        </td>
       </tr>
-      </blockTable>
-      </td>
-      <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-      </tr>
-    <tr>
-        <td><para style="P3">[[ repeatIn(lines(o), 'line') ]] <font>[[ formatLang(line['ldate'],date=True) ]]</font></para></td>
-        <td><para style="P3">[[ line['partner'] or '']]</para></td>
-        <td><para style="P3">[[ line['lref'] or '']]</para></td>
-        <td><para style="P3">[[ line['move'] or '']]</para></td>
-        <td><para style="P3">[[ line['lname'] or '' ]]</para></td>
-        <td><para style="P4">[[ formatLang(line['debit']) ]]</para></td>
-        <td><para style="P4">[[ formatLang(line['credit']) ]]</para></td>
-        <td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
-     </tr>
     </blockTable>
-     </section>
-
-     <blockTable colWidths="45.0,45.0,55.0,60.0,60.0,62.5,62.5,77.5,77.5" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
-        <tr>
-          <td><para style="date">Date</para></td>
-          <td><para style="P3b">Partner</para></td>
-          <td><para style="terp_tblheader_Details_Centre">Ref</para></td>
-          <td><para style="terp_tblheader_Details_Centre">Move</para></td>
-          <td><para style="P3b">Entry Label</para></td>
-          <td><para style="P9b">Debit</para></td>
-          <td><para style="P9b">Credit</para></td>
-          <td><para style="P9b">Balance</para></td>
-          <td><para style="P9b">Currency</para></td>
-        </tr>
-     </blockTable>
-     <section>
-     <para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-     <blockTable rowHeights="0.55cm" colWidths="45.0,45.0,55.0,60.0,60.0,62.5,62.5,77.5,77.5" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
-       <tr>
-          <td>
-          <blockTable rowHeights="0.55cm" colWidths="230.0,30.0,62.5,62.5,77.5,77.5" style="Table5">
-              <tr>
-                <td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code or '' ]] [[ o.name or '' ]]</para></td>
-                <td><para style="Standard"></para></td>
-                <td alignment="right"><para style="P9b"><u>[[formatLang(sum_debit_account(o)) ]]</u></para></td>
-                <td alignment="right"><para style="P9b"><u>[[formatLang(sum_credit_account(o)) ]]</u></para></td>
-                <td><para style="P9b"><u>[[formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]]</u></para></td>
-               <td><para style="P9b"><u>[[ o.currency_id and sum_currency_amount_account(o) +o.currency_id.symbol or '' ]]</u></para></td>
-              </tr>
-          </blockTable>
-      </td>
-      <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
-        <td><para style="Standard"></para></td>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">JNRL</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Partner</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Ref</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Move</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Entry Label</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Counterpart</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Currency</para>
+        </td>
       </tr>
-    <tr>
-       <td><para style="P3">[[ repeatIn(lines(o), 'line') ]] <font>[[ formatLang(line['ldate'],date=True) ]]</font></para></td>
-       <td><para style="P3">[[ line['partner'] or '' ]]</para></td>
-       <td><para style="P3">[[ line['lref'] or '']]</para></td>
-       <td><para style="P3">[[ line['move'] or '' ]]</para></td>
-       <td><para style="P3">[[ line['lname'] or '' ]]</para></td>
-       <td><para style="P4">[[ formatLang(line['debit']) ]]</para></td>
-       <td><para style="P4">[[ formatLang(line['credit']) ]]</para></td>
-       <td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
-	   <td><para style="P4"><font>[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[  formatLang(line['amount_currency'])]] [[  line['currency_code'] or '']]</font></para></td>
-     </tr>
-  </blockTable>
-  </section>
-  </pto>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+      <blockTable rowHeights="0.55cm" colWidths="278.0,57.0,57.0,74.0,74.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
+        <blockTable rowHeights="0.55cm" colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+          <tr>
+            <td>
+              <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ line['lcode'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ strip_name(line['partner_name'],10) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ strip_name(line['lname'],10) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),10) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8"><font>[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+    </section>
+    <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">JNRL</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Partner</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Ref</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Move</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Entry Label</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Counterpart</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+      <blockTable rowHeights="0.55cm" colWidths="349.0,57.0,57.0,77.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
+        <blockTable rowHeights="0.55cm" colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table6">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+          <tr>
+            <td>
+              <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ line['lcode'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ strip_name(line['partner_name'],20) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ strip_name(line['lname'],18) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),20) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+    </section>
+    </pto>
   </story>
-</document>
+</document>
\ No newline at end of file

From fa8274e0380eacc72bd99f0540d1a827e5675704 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Thu, 25 Nov 2010 15:36:41 +0100
Subject: [PATCH 14/16] [IMP] account: set the journal code size to 5 chars max
 in order to improve the reports (smaller column for this field without any
 risk)

bzr revid: qdp-launchpad@tinyerp.com-20101125143641-02t6o55nxg396rk5
---
 addons/account/account.py               |  2 +-
 addons/account/demo/account_minimal.xml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 485b085fbbe..f557861700e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -585,7 +585,7 @@ class account_journal(osv.osv):
     _description = "Journal"
     _columns = {
         'name': fields.char('Journal Name', size=64, required=True, translate=True),
-        'code': fields.char('Code', size=16, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
+        'code': fields.char('Code', size=5, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
         'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
                                  help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
                                  " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 10f2df28605..871ef514836 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -342,7 +342,7 @@
 
         <record id="sales_journal" model="account.journal">
             <field name="name">Sales Journal - (test)</field>
-            <field name="code">SAJ - (test)</field>
+            <field name="code">TSAJ</field>
             <field name="type">sale</field>
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
@@ -353,7 +353,7 @@
         </record>
         <record id="refund_sales_journal" model="account.journal">
             <field name="name">Sales Credit Note Journal - (test)</field>
-            <field name="code">SCNJ - (test)</field>
+            <field name="code">TSCNJ</field>
             <field name="type">sale_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
@@ -366,7 +366,7 @@
 
         <record id="expenses_journal" model="account.journal">
             <field name="name">Expenses Journal - (test)</field>
-            <field name="code">EXJ - (test)</field>
+            <field name="code">TEXJ</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
@@ -377,7 +377,7 @@
         </record>
         <record id="refund_expenses_journal" model="account.journal">
             <field name="name">Expenses Credit Notes Journal - (test)</field>
-            <field name="code">ECNJ - (test)</field>
+            <field name="code">TECNJ</field>
             <field name="type">purchase_refund</field>
             <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
@@ -390,7 +390,7 @@
 
         <record id="bank_journal" model="account.journal">
             <field name="name">Bank Journal - (test)</field>
-            <field name="code">BNK - (test)</field>
+            <field name="code">TBNK</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_bank_journal"/>
@@ -401,7 +401,7 @@
         </record>
         <record id="check_journal" model="account.journal">
             <field name="name">Checks Journal - (test)</field>
-            <field name="code">CHK - (test)</field>
+            <field name="code">TCHK</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_check_journal"/>
@@ -412,7 +412,7 @@
         </record>
         <record id="cash_journal" model="account.journal">
             <field name="name">Cash Journal - (test)</field>
-            <field name="code">CSH - (test)</field>
+            <field name="code">TCSH</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>

From fa408fab65a590b73c2164a052abcbb2562420ec Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Thu, 25 Nov 2010 15:41:27 +0100
Subject: [PATCH 15/16] [IMP] account: improved the general ledger report

bzr revid: qdp-launchpad@tinyerp.com-20101125144127-b7xf8xta4w2jcwkd
---
 .../account/report/account_general_ledger.py  |  16 +-
 .../account_general_ledger_landscape.rml      | 183 ++++++++++--------
 2 files changed, 109 insertions(+), 90 deletions(-)

diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 891d9ec92b3..b904aba298f 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -155,12 +155,12 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
 
         # Then select all account_move_line of this account
         if self.sortby == 'sort_journal_partner':
-            sql_sort='j.code, p.name'
+            sql_sort='j.code, p.name, l.move_id'
         else:
-            sql_sort='l.date'
+            sql_sort='l.date, l.move_id'
         sql = """
             SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id,
-            m.name AS move_name, m.id AS mmove_id,
+            m.name AS move_name, m.id AS mmove_id,per.code as period_code,
             c.symbol AS currency_code,
             i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number,
             p.name AS partner_name
@@ -169,6 +169,7 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
             LEFT JOIN res_currency c on (l.currency_id=c.id)
             LEFT JOIN res_partner p on (l.partner_id=p.id)
             LEFT JOIN account_invoice i on (m.id =i.move_id)
+            LEFT JOIN account_period per on (per.id=l.period_id)
             JOIN account_journal j on (l.journal_id=j.id)
             WHERE %s AND m.state IN %s AND l.account_id = %%s ORDER by %s
         """ %(self.query, tuple(move_state), sql_sort)
@@ -179,7 +180,7 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
             #FIXME: replace the label of lname with a string translatable
             sql = """
                 SELECT 0 AS lid, '' AS ldate, '' AS lcode, COALESCE(SUM(l.amount_currency),0.0) AS amount_currency, '' AS lref, 'Initial Balance' AS lname, COALESCE(SUM(l.debit),0.0) AS debit, COALESCE(SUM(l.credit),0.0) AS credit, '' AS lperiod_id, '' AS lpartner_id,
-                '' AS move_name, '' AS mmove_id,
+                '' AS move_name, '' AS mmove_id, '' AS period_code,
                 '' AS currency_code,
                 NULL AS currency_id,
                 '' AS invoice_id, '' AS invoice_type, '' AS invoice_number,
@@ -196,15 +197,12 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
             res_init = self.cr.dictfetchall()
         res = res_init + res_lines
         account_sum = 0.0
-        inv_types = { 'out_invoice': 'CI', 'in_invoice': 'SI', 'out_refund': 'OR', 'in_refund': 'SR', }
         for l in res:
-            l['move'] = l['move_name']
-            if l['invoice_id']:
-                l['lref'] = '%s: %s'%(inv_types[l['invoice_type']], l['invoice_number'])
+            l['move'] = l['move_name'] != '/' and l['move_name'] or ('*'+str(l['mmove_id']))
             l['partner'] = l['partner_name'] or ''
             account_sum += l['debit'] - l['credit']
             l['progress'] = account_sum
-            l['line_corresp'] = l['mmove_id'] == '' and ' ' or counterpart_accounts[l['mmove_id']]
+            l['line_corresp'] = l['mmove_id'] == '' and ' ' or counterpart_accounts[l['mmove_id']].replace(', ',',')
             # Modification of amount Currency
             if l['credit'] > 0:
                 if l['amount_currency'] != None:
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index fcf635e3a5c..56624256300 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -176,6 +176,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
@@ -196,6 +197,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
@@ -210,6 +212,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table11">
       <blockAlignment value="LEFT"/>
@@ -229,6 +232,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -247,52 +251,54 @@
     <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="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_7" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <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_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" 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="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_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.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"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" 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"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <images/>
   </stylesheet>
   <story>
   	<pto>
   	<pto_header>
-  		<blockTable colWidths="40.0,50.0,105.0,67.0,65.0,130.0,50.0,70.0,65.0,75.0,70.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
-
+  		<blockTable colWidths="45.0,35.0,30.0,90.0,65.0,55.0,100.0,70.0,65.0,65.0,75.0,75.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
 	      <tr>
 	        <td>
 	          <para style="terp_tblheader_Details">Date</para>
 	        </td>
 	        <td>
-	          <para style="terp_tblheader_Details">JNRL</para>
+	          <para style="terp_tblheader_Details">Period</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details">JRNL</para>
 	        </td>
 	        <td>
 	          <para style="terp_tblheader_Details">Partner</para>
 	        </td>
 	        <td>
-	          <para style="terp_tblheader_Details_Centre">Ref</para>
+	          <para style="terp_tblheader_Details">Ref</para>
 	        </td>
 	        <td>
-	          <para style="terp_tblheader_Details_Centre">Move</para>
+	          <para style="terp_tblheader_Details">Move</para>
 	        </td>
 	        <td>
 	          <para style="terp_tblheader_Details">Entry Label</para>
 	        </td>
 	        <td>
-	          <para style="terp_tblheader_Details_Centre">Counterpart</para>
+	          <para style="terp_tblheader_Details">Counterpart</para>
 	        </td>
 	        <td>
 	          <para style="terp_tblheader_Details_Right">Debit</para>
@@ -307,29 +313,32 @@
 	          <para style="terp_tblheader_Details_Right">Currency</para>
 	        </td>
 	      </tr>
-	    </blockTable>
-  		<blockTable colWidths="37.0,54.0,113.0,71.0,71.0,142.0,71.0,71.0,71.0,85.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+	    </blockTable>  
+  		<blockTable colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
 	      <tr>
 	        <td>
 	          <para style="terp_tblheader_Details">Date</para>
 	        </td>
 	        <td>
-	          <para style="terp_tblheader_Details">JNRL</para>
+	          <para style="terp_tblheader_Details">Period</para>
+	        </td>
+	        <td>
+	          <para style="terp_tblheader_Details">JRNL</para>
 	        </td>
 	        <td>
 	          <para style="terp_tblheader_Details">Partner</para>
 	        </td>
 	        <td>
-	          <para style="terp_tblheader_Details_Centre">Ref</para>
+	          <para style="terp_tblheader_Details">Ref</para>
 	        </td>
 	        <td>
-	          <para style="terp_tblheader_Details_Centre">Move</para>
+	          <para style="terp_tblheader_Details">Move</para>
 	        </td>
 	        <td>
 	          <para style="terp_tblheader_Details">Entry Label</para>
 	        </td>
 	        <td>
-	          <para style="terp_tblheader_Details_Centre">Counterpart</para>
+	          <para style="terp_tblheader_Details">Counterpart</para>
 	        </td>
 	        <td>
 	          <para style="terp_tblheader_Details_Right">Debit</para>
@@ -343,9 +352,9 @@
 	      </tr>
 	    </blockTable>
   	</pto_header>
-    <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para>
+    <para style="terp_default_7">[[ repeatIn(objects, 'a') ]]</para>
     <para style="terp_header_Centre">General Ledger</para>
-    <para style="terp_default_8">
+    <para style="terp_default_7">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
@@ -377,19 +386,19 @@
     <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">[[ get_account(data) or removeParentNode('para') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
+          <para style="terp_default_Centre_7">[[ get_fiscalyear(data) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
+          <para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para>
+          <para style="terp_default_Centre_7">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
           <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
@@ -403,10 +412,10 @@
           <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
             <tr>
               <td>
-                <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
+                <para style="terp_default_Centre_7">[[ formatLang(get_start_date(data),date=True) ]]</para>
               </td>
               <td>
-                <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
+                <para style="terp_default_Centre_7">[[ formatLang(get_end_date(data),date=True) ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -423,47 +432,50 @@
           <blockTable colWidths="58.0,58.0" style="Table6">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
             <tr>
               <td>
-                <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
+                <para style="terp_default_Centre_7">[[ get_start_period(data) or removeParentNode('para') ]]</para>
               </td>
               <td>
-                <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
+                <para style="terp_default_Centre_7">[[ get_end_period(data) or removeParentNode('para') ]]</para>
               </td>
             </tr>
           </blockTable>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para>
+          <para style="terp_default_Centre_7">[[ get_sortby(data) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
+          <para style="terp_default_Centre_7">[[ get_target_move(data) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="terp_default_7">
        <font color="white"> </font>
     </para>
-    <blockTable colWidths="40.0,50.0,105.0,67.0,65.0,130.0,50.0,70.0,65.0,75.0,70.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+    <blockTable colWidths="45.0,35.0,30.0,90.0,65.0,55.0,100.0,70.0,65.0,65.0,75.0,75.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">JNRL</para>
+          <para style="terp_tblheader_Details">Period</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">JRNL</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref</para>
+          <para style="terp_tblheader_Details">Ref</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Move</para>
+          <para style="terp_tblheader_Details">Move</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Counterpart</para>
+          <para style="terp_tblheader_Details">Counterpart</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Debit</para>
@@ -480,89 +492,95 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="508.0,70.0,65.0,75.0,70.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+      <para style="terp_default_7">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+      <blockTable rowHeights="0.55cm" colWidths="490.0,65.0,65.0,75.0,75.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
         <tr>
           <td>
-            <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+            <para style="terp_default_Bold_8"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</para>
+            <para style="terp_default_Bold_8_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</para>
           </td>
         </tr>
       </blockTable>
       <section>
-        <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
-        <blockTable rowHeights="0.55cm" colWidths="40.0,50.0,105.0,67.0,65.0,130.0,50.0,70.0,65.0,75.0,70.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+        <para style="terp_default_7">[[ repeatIn(lines(o), 'line') ]]</para>
+        <blockTable rowHeights="0.55cm" colWidths="45.0,35.0,30.0,90.0,65.0,55.0,100.0,70.0,65.0,65.0,75.0,75.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
           <tr>
             <td>
-              <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+              <para style="terp_default_7">[[ formatLang(line['ldate'],date=True) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ line['lcode'] ]]</para>
+              <para style="terp_default_7">[[ line['period_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ line['partner_name'] ]]</para>
+              <para style="terp_default_7">[[ line['lcode'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ line['lref'] ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['partner_name'],21) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_8">[[ line['move'] ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['lref'],17) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ line['lname'] ]]</para>
+              <para style="terp_default_7">[[ line['move'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),20) ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['lname'],26) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['line_corresp'],18) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
+              <para style="terp_default_Right_7">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8"><font size="7.0">[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para>
+              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_7">[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</para>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <blockTable colWidths="37.0,54.0,113.0,71.0,71.0,142.0,71.0,71.0,71.0,85.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">JNRL</para>
+          <para style="terp_tblheader_Details">Period</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">JRNL</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref</para>
+          <para style="terp_tblheader_Details">Ref</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Move</para>
+          <para style="terp_tblheader_Details">Move</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Counterpart</para>
+          <para style="terp_tblheader_Details">Counterpart</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Debit</para>
@@ -577,55 +595,58 @@
     </blockTable>
     <section>
       <para style="Standard">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="565.0,70.0,70.0,80.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+      <blockTable rowHeights="0.55cm" colWidths="575.0,65.0,65.0,75.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
-            <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+            <para style="terp_default_Bold_8"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
       <section>
         <para style="Standard">[[ repeatIn(lines(o), 'line') ]]</para>
-        <blockTable rowHeights="0.55cm" colWidths="40.0,54.0,118.0,70.0,70.0,144.0,70.0,70.0,70.0,80.0" style="Table12">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+        <blockTable rowHeights="0.55cm" colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table12">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
           <tr>
             <td>
-              <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+              <para style="terp_default_7">[[ formatLang(line['ldate'],date=True) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ line['lcode'] ]]</para>
+              <para style="terp_default_7">[[ line['period_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ line['partner_name'] ]]</para>
+              <para style="terp_default_7">[[ line['lcode'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ line['lref'] ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['partner_name'],25) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_8">[[ line['move'] ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['lref'],21) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ line['lname'] ]]</para>
+              <para style="terp_default_7">[[ line['move'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),20) ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['lname'],35) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['line_corresp'],23) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
+              <para style="terp_default_Right_7">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -633,4 +654,4 @@
     </section>
     </pto>
   </story>
-</document>
\ No newline at end of file
+</document>

From ebdc0eeac3c11bf19454a7bde3833c917a70f457 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Thu, 25 Nov 2010 18:46:55 +0100
Subject: [PATCH 16/16] [IMP] account: report 'Journals' improved

bzr revid: qdp-launchpad@tinyerp.com-20101125174655-qzlp9m3qe4oybnrl
---
 addons/account/report/account_journal.py  |   2 +-
 addons/account/report/account_journal.rml | 181 ++++++++++------------
 2 files changed, 87 insertions(+), 96 deletions(-)

diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 82af01cdb0b..d43adeef2be 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -118,7 +118,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         if self.target_move == 'posted':
             move_state = ['posted']
 
-        self.cr.execute('SELECT l.id FROM account_move_line l, account_move am WHERE l.move_id=am.id AND am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' ORDER BY l.'+ self.sort_selection + '',(tuple(move_state), period_id, tuple(journal_id) ))
+        self.cr.execute('SELECT l.id FROM account_move_line l, account_move am WHERE l.move_id=am.id AND am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' ORDER BY l.'+ self.sort_selection + ', l.move_id',(tuple(move_state), period_id, tuple(journal_id) ))
         ids = map(lambda x: x[0], self.cr.fetchall())
         return obj_mline.browse(self.cr, self.uid, ids)
 
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index c2807a2e8a2..a81c634ddc8 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -128,22 +128,14 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10a" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10b" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11a" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10a" fontName="Helvetica-Bold" fontSize="7.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10b" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11a" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <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"/>
@@ -151,23 +143,21 @@
     <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="7.0" leading="10" spaceBefore="12.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"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.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_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_default_8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.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="6.0" spaceAfter="6.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="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="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_default_Right_8" fontName="Helvetica" fontSize="7.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="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -175,10 +165,9 @@
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <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_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" 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_left" fontName="Helvetica-Bold" fontSize="8.0" leading="8" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_left" fontName="Helvetica-Bold" fontSize="7.0" leading="8" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
   </stylesheet>
   <images/>
   <story>
@@ -196,117 +185,119 @@
     </para>
       <blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">  [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para>
-      	<para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
+          <td><para style="terp_tblheader_General_Centre">  [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-		<td><para style="terp_tblheader_General_Centre">Journal</para></td>
+        <td><para style="terp_tblheader_General_Centre">Journal</para></td>
         <td><para style="terp_tblheader_General_Centre">Filters By </para></td>
          <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td>
         <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
-	<tr>
-	   <td><para style="terp_default_Centre_8">[[ get_account(data) or ''  ]]</para></td>
+    <tr>
+       <td><para style="terp_default_Centre_8">[[ get_account(data) or ''  ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
-		<td><para style="terp_default_Centre_8">[[o.journal_id.name  ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[o.journal_id.name  ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-				<tr>
-	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
-	        	</tr>
-	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-	        	</tr>
-        	</blockTable>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-				<tr>
-			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
-	        	</tr>
-	        	<tr>
-			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-	        	</tr>
-        	 </blockTable>
-        	</td>
+            <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+                <tr>
+                   <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
+                    <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
+                </tr>
+                <tr>
+                    <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+                    <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
+                </tr>
+            </blockTable>
+            <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+                <tr>
+                    <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
+                    <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
+                </tr>
+                <tr>
+                    <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
+                    <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
+                </tr>
+             </blockTable>
+            </td>
         <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
-	<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
-	</tr>
-	</blockTable>
+    <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
+    </tr>
+    </blockTable>
     <para style="P9">
       <font color="white"> </font>
     </para>
      <para style="P9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="45.0,65.0,50.0,50.0,100.0,80.0,80.0,80.0" style="Table1" repeatRows="1">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable rowHeights="0.55cm" colWidths="40.0,75.0,50.0,50.0,72.0,131.0,68.0,68.0" style="Table1" repeatRows="1">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="P10a">Date</para></td>
-        <td><para style="P10">Entry No</para></td>
-        <td><para style="P10">A/c No.</para></td>
+        <td><para style="P10a">Ref</para></td>
+        <td><para style="P10a">Move</para></td>
+        <td><para style="P10a">Account</para></td>
         <td><para style="P10a">Partner</para></td>
-        <td><para style="P10a">Move/Entry Label</para></td>
+        <td><para style="P10a">Label</para></td>
         <td><para style="P10b">Debit</para></td>
         <td><para style="P10b">Credit</para></td>
-        <td><para style="P10b">Balance</para></td>
       </tr>
        <tr>
         <td><para style="P11">[[o.period_id.name ]]</para></td>
-        <td><para style="P11a">[[ o.journal_id.code ]]</para></td>
+        <td><para style="P11">[[ o.journal_id.code ]]</para></td>
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
-        <td><para style="P12"><u>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
-        <td><para style="P12"><u>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
-        <td><para style="P12"><u>[[ formatLang((sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id))) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td><para style="P11"><font color="white"></font></para></td>
+        <td><para style="P12">[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P12">[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
       </tr>
       <para style="Standard"><font color="white">[[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]]</font></para>
       <tr>
         <td><para style="terp_default_8">[[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]]</para><para style="terp_default_8">[[ formatLang(line.date,date=True) ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ line.ref ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ line.account_id.code ]]</para></td>
-        <td><para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para></td>
-        <td><para style="terp_default_8">[[ line.move_id.name ]] - [[ line.name ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.debit) ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.credit) ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="terp_default_8">[[ strip_name(line.ref,20) ]]</para></td>
+        <td><para style="terp_default_8">[[ line.move_id.name &lt;&gt; '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]]</para></td> 
+        <td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
+        <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,16) ]]</para></td>
+        <td><para style="terp_default_8">[[ strip_name(line.name,35) ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
       </tr>
     </blockTable>
 
-    <blockTable colWidths="45.0,55.0,50.0,50.0,65.0,62.5,62.5,80.0,80.0" style="Table1" repeatRows="1">[[ display_currency(data)  or removeParentNode('blockTable') ]]
+    <blockTable rowHeights="0.55cm" colWidths="40.0,75.0,50.0,50.0,72.0,66.0,68.0,68.0,68.0" style="Table1" repeatRows="1">[[ display_currency(data)  or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="P10a">Date</para></td>
-        <td><para style="P10">Entry No</para></td>
-        <td><para style="P10">A/c No.</para></td>
+        <td><para style="P10a">Ref</para></td>
+        <td><para style="P10a">Move</para></td>
+        <td><para style="P10a">Account</para></td>
         <td><para style="P10a">Partner</para></td>
-        <td><para style="P10a">Move/Entry Label</para></td>
+        <td><para style="P10a">Label</para></td>
         <td><para style="P10b">Debit</para></td>
         <td><para style="P10b">Credit</para></td>
-   		<td><para style="P10b">Balance</para></td>
-		<td><para style="P10b">Currency</para></td>
+        <td><para style="P10b">Currency</para></td>
       </tr>
        <tr>
         <td><para style="P11">[[o.period_id.name ]]</para></td>
-        <td><para style="P11a">[[ o.journal_id.code ]]</para></td>
+        <td><para style="P11">[[ o.journal_id.code ]]</para></td>
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
         <td><para style="P11"><font color="white"></font></para></td>
-        <td><para style="P12"><u>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
-        <td><para style="P12"><u>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
-		<td> <para style="P12"><u>[[ formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ company.currency_id.symbol ]]</u></para></td>
+        <td><para style="P11"><font color="white"></font></para></td>
+        <td><para style="P12">[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P12">[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]]</para></td>
+        <!-- given a period and a journal, the sum of debit will always be equal to the sum of credit, so there is no point to display it-->
+        <td><para style="P12"> <!--o.journal_id.currency and formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ o.journal_id.currency and o.journal_id.currency.symbol --></para></td>
       </tr>
        <para style="Standard"><font color="white">[[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]]</font></para>
       <tr>
         <td><para style="terp_default_8">[[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]]</para><para style="terp_default_8">[[ formatLang(line.date,date=True) ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ line.ref ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ line.account_id.code ]]</para></td>
-        <td><para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para></td>
-        <td><para style="terp_default_8">[[ line.move_id.name ]] - [[ line.name ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.debit) ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.credit) ]]</para></td>
-        <td><para style="P8">[[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
-		<td><para style="P8">[[ line.currency_id  and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']]</para></td>
+        <td><para style="terp_default_8">[[ strip_name(line.ref,20) ]]</para></td>
+        <td><para style="terp_default_8">[[ line.move_id.name &lt;&gt; '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]]</para></td> 
+        <td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
+        <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,16) ]]</para></td>
+        <td><para style="terp_default_8">[[ strip_name(line.name,17) ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
+        <td><para style="P8">[[ line.currency_id  and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']]</para></td>
       </tr>
     </blockTable>
   </story>