From b944bd792dda9c8f11432386f4a691229b0bb388 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 26 Aug 2010 15:24:45 +0530
Subject: [PATCH] [IMP]:account:Improved general/central journal report.

bzr revid: apa@tinyerp.com-20100826095445-epsendwp5qvfi2j8
---
 .../report/account_central_journal.rml        | 88 +++++++++----------
 .../report/account_general_journal.rml        |  6 +-
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 03ae0ed3bc1..a1d36fcdcc8 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <document filename="central_journal.pdf">
-  <template pageSize="(595.0,842.0)" title="Central Journal" author="OpenERP" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Centralized Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="42.0" width="539" height="758"/>
 			<pageGraphics>
 
-			</pageGraphics>        
+			</pageGraphics>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -97,8 +97,8 @@
       <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="4,-1" stop="4,-1"/>
+	<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Account_detail_Title_Currency">
       <blockAlignment value="LEFT"/>
@@ -107,14 +107,14 @@
       <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"/> 
-    </blockTableStyle>    
+	  <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"/>
+    </blockTableStyle>
  <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
    <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>       
+    </blockTableStyle>
     <blockTableStyle id="Table_Final_Total">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -122,8 +122,8 @@
       <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="4,-1" stop="4,-1"/>
+   	  <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
      <blockTableStyle id="Table_Final_Total_currency">
       <blockAlignment value="LEFT"/>
@@ -133,8 +133,8 @@
       <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="5,-1" stop="5,-1"/>
+	 <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Journal_Line_Content">
       <blockAlignment value="LEFT"/>
@@ -143,8 +143,8 @@
       <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="4,-1" stop="4,-1"/>
+   	 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_Journal_Line_Content_currency">
       <blockAlignment value="LEFT"/>
@@ -154,8 +154,8 @@
       <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"/>      
-    </blockTableStyle>  
+  	<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -186,9 +186,9 @@
       <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>
-     
+
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -235,7 +235,7 @@
       <tr>
         <td><para style="terp_header"><font color="white"> </font></para>
         </td>
-        <td><para style="terp_header_Centre">Central Journal</para></td>
+        <td><para style="terp_header_Centre">Centralized Journal</para></td>
         <td><para style="terp_header"><font color="white"> </font></para></td>
       </tr>
     </blockTable>
@@ -244,10 +244,10 @@
     </para>
 	<blockTable colWidths="90.0,80.0,100.0,130.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">Filter By  [[get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
 	        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
@@ -259,37 +259,37 @@
         	<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>        	
+	        		<td><para style="terp_tblheader_Details_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">[[ 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>        	
+			        <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>        	 
+        	 </blockTable>
         	</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="P9">
       <font color="white"> </font>
-    </para>    
+    </para>
     <blockTable colWidths="50.0,200.0,95.0,92.0,69.0" style="Table_Account_detail_Title">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_tblheader_Details">A/C No.</para></td>
         <td><para style="terp_tblheader_Details">Account Name</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">Balance</para></td>
       </tr>
     </blockTable>
    <blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
@@ -298,17 +298,17 @@
         <td><para style="terp_tblheader_Details">Account Name</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>                
+		<td><para style="terp_tblheader_Details_Right">Balance</para></td>
+		<td><para style="terp_tblheader_Details_Right">Currency</para></td>
       </tr>
-    </blockTable>    
+    </blockTable>
     <blockTable colWidths="50.0,200.0,94.0,92.0,69.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]]</para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]]</para></td>
-		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]]</para></td>        
+		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]]</para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
@@ -317,10 +317,10 @@
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]]</para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]]</para></td>
-		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]]</para></td>                
-		 <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>              
+		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]]</para></td>
+		 <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
       </tr>
-    </blockTable>    
+    </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
       <blockTable colWidths="50.0,200.0,94.0,92.0,69.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
@@ -329,7 +329,7 @@
           <td><para style="terp_default_9">[[ 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['credit']-line['debit']) ]]</para></td>          
+ 		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]]</para></td>
         </tr>
       </blockTable>
       <blockTable colWidths="50.0,150.0,95.0,92.0,69.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
@@ -338,10 +338,10 @@
           <td><para style="terp_default_9">[[ 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['credit']-line['debit']) ]]</para></td>                    
-		  <td><para style="terp_default_Right_9">[[ line['currency_id'] and formatLang(line['amount_currency'] or '') ]] [[ line['currency_id'] and  line['currency_code'] or '']]</para></td>        
+  			<td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]]</para></td>
+		  <td><para style="terp_default_Right_9">[[ line['currency_id'] and formatLang(line['amount_currency'] or '') ]] [[ line['currency_id'] and  line['currency_code'] or '']]</para></td>
         </tr>
-      </blockTable>      
+      </blockTable>
       <para style="terp_default_2">
         <font color="white"> </font>
       </para>
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 244f9ac8291..7bdcf6e3ba3 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="general_journal.pdf">
-  <template pageSize="(596.0,842.0)" title="General Journal" author="OpenERP" allowSplitting="20">
+  <template pageSize="(596.0,842.0)" title="General Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="42.0" width="540" height="758"/>
 			<pageGraphics>
@@ -242,8 +242,8 @@
 	        		<td><para style="terp_tblheader_Details_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="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]