From 29ea95c1da866cde1e8b71220b1c35f657308f25 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 14:09:22 +0530
Subject: [PATCH] [IMP]:account:Improved partner ledger report(both).

bzr revid: apa@tinyerp.com-20100826083922-8ytg35m5epsiw9c0
---
 .../account/report/account_partner_ledger.rml | 78 +++++++++----------
 .../report/account_partner_ledger_other.rml   | 42 +++++-----
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 934591032e8..23453145800 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <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"/>
     </pageTemplate>
@@ -68,8 +68,8 @@
       <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"/>     
-    </blockTableStyle>    
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+    </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -84,7 +84,7 @@
  	<blockTableStyle id="Table3_header">
       <blockAlignment value="LEFT"/>
         <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>    
+    </blockTableStyle>
      <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -100,9 +100,9 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      
+
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,-1"/>
-    </blockTableStyle>    
+    </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -123,7 +123,7 @@
       <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"/>
-    </blockTableStyle>    
+    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -174,7 +174,7 @@
     <blockTable colWidths="539.0" style="Table_header">
       <tr>
         <td>
-          <para style="terp_header_Centre">Third Party Ledger</para>
+          <para style="terp_header_Centre">Partner Ledger</para>
         </td>
         <tr>
           <td>
@@ -193,34 +193,34 @@
     </para>
     <para style="P4">
       <font color="white"> </font>
-    </para>  
+    </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>
       <para style="P4">
       <font color="white"> </font>
     </para>
           <para style="P4">
       <font color="white"> </font>
-    </para>    
+    </para>
       <para style="P4">
       <font color="white"> </font>
     </para>
           <para style="P4">
       <font color="white"> </font>
-    </para>    
+    </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">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">Printing Date</para></td>
@@ -233,28 +233,28 @@
         	<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>        	
+	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
+	        	</tr>
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ get_start_date(data) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ get_end_date(data) ]]</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>
         	<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>        	
+			        <td><para style="terp_tblheader_General_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>        	 
+        	 </blockTable>
         	</td>
-	<td><para style="terp_default_Centre_8">[[ get_partners() ]]</para></td>        	
+	<td><para style="terp_default_Centre_8">[[ get_partners() ]]</para></td>
 	<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
 	</tr>
-	</blockTable>  
+	</blockTable>
      <para style="P4">
       <font color="white"> </font>
     </para>
@@ -285,13 +285,13 @@
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
+          <para style="terp_tblheader_Details_Right">Debit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
+          <para style="terp_tblheader_Details_Right">Credit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance([[ get_currency(data) ]])</para>
         </td>
       </tr>
     </blockTable>
@@ -397,16 +397,16 @@
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
+          <para style="terp_tblheader_Details_Right">Debit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
+          <para style="terp_tblheader_Details_Right">Credit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance ([[ get_currency(data) ]])</para>
         </td>
          <td>
-          <para style="terp_tblheader_Details_Right">Currency</para>
+          <para style="terp_tblheader_Details_Right">Currency ([[ get_currency(data) ]])</para>
         </td>
       </tr>
     </blockTable>
@@ -435,7 +435,7 @@
       <font color="white"> </font>
     </para>
     <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-    
+
       <tr>
         <td>
           <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -448,7 +448,7 @@
         </td>
         <td>
           <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]]</para>
-        </td>     
+        </td>
         <td>
           <para style="P5">
             <font color="white"> </font>
@@ -470,7 +470,7 @@
         </td>
    		<td>
           <para style="P5"></para>
-        </td>  
+        </td>
     </tr>
     </blockTable>
     <para style="terp_default_2">
@@ -510,7 +510,7 @@
         <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 7396734fdc9..1869144cfc9 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <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"/>
     </pageTemplate>
@@ -180,7 +180,7 @@
       <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="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
 
     </blockTableStyle>
     <blockTableStyle id="Table9">
@@ -196,7 +196,7 @@
     <blockTableStyle id="Table_header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-    </blockTableStyle>    
+    </blockTableStyle>
     <blockTableStyle id="Table_header_1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -320,7 +320,7 @@
     <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_Right_1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -333,7 +333,7 @@
     <blockTable colWidths="539.0" style="Table_header">
       <tr>
         <td>
-          <para style="terp_header_Centre">Third Party Ledger</para>
+          <para style="terp_header_Centre">Partner Ledger</para>
         </td>
         <tr>
           <td>
@@ -391,10 +391,10 @@
                   </tr>
                   <tr>
                     <td>
-                      <para style="terp_default_Centre_8">[[ get_start_date(data) ]]</para>
+                      <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
                     </td>
                     <td>
-                      <para style="terp_default_Centre_8">[[ get_end_date(data) ]]</para>
+                      <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
                     </td>
                   </tr>
                 </blockTable>
@@ -446,13 +446,13 @@
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
+          <para style="terp_tblheader_Details_Right">Debit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
+          <para style="terp_tblheader_Details_Right">Credit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance([[ get_currency(data) ]])</para>
         </td>
       </tr>
     </blockTable>
@@ -472,11 +472,11 @@
         </td>
       </tr>
     </blockTable>
-    
+
 	<section>
 	<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
     <blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-	
+
       <tr>
         <td>
           <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -535,7 +535,7 @@
       </blockTable>
     </section>
     </section>
-    <blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]] 
+    <blockTable colWidths="57.0,25.0,40.0,154.0,67.0,66.0,65.0,65.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -550,21 +550,21 @@
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
+          <para style="terp_tblheader_Details_Right">Debit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
+          <para style="terp_tblheader_Details_Right">Credit([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance([[ get_currency(data) ]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Currency</para>
+          <para style="terp_tblheader_Details_Right">Currency ([[ get_currency(data) ]])</para>
         </td>
       </tr>
     </blockTable>
     <para style="P4"/>
-    <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ display_currency(data) == True or removeParentNode('blockTable') ]] 
+    <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table5">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_default_Bold_9">Balance Brought Forward</para>
@@ -588,7 +588,7 @@
     <section>
     <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
     <blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
- 
+
       <tr>
         <td>
           <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -623,8 +623,8 @@
         </td>
    		<td>
           <para style="terp_default_Right_9"></para>
-        </td>    
-        </tr>   
+        </td>
+        </tr>
     </blockTable>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>