From 366ba22b71a3b401030f892ceb62aa23110bce62 Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Mon, 20 Oct 2008 18:03:57 +0530
Subject: [PATCH] Mvt column size changed in General ledger.(Viral Rami)

bzr revid: patelamit2003@gmail.com-20081020123357-jh9z5hiqh8pb786b
---
 addons/account/report/general_ledger.rml      | 66 +++++++-------
 .../report/general_ledger_landscape.rml       | 86 +++++++++----------
 2 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index e42d0368d70..20817dff3f3 100755
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -23,7 +23,7 @@
 				<drawString x="1.0cm" y="1cm"> [[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]]</drawString>
 				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
 				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-				
+
 
 			    <lineMode width="0.7"/>
 				<lines>1cm 27.7cm 20cm 27.7cm</lines>
@@ -32,29 +32,29 @@
     </pageTemplate>
   </template>
    <stylesheet>
-   
+
     <blockTableStyle id="tbl_header">
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-     
+
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
-    
+
     <blockTableStyle id="tbl_content">
-      
+
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
-    
-   
+
+
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,0"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    
-    
+
+
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -91,7 +91,7 @@
     <paraStyle name="Index" fontName="Helvetica"/>
   </stylesheet>
   <story>
-  	 <blockTable colWidths="54.0,155.0,70.0,20.0,80.0,59.0,52.0,54.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+  	 <blockTable colWidths="54.0,135.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3_centre">Date</para>
@@ -122,7 +122,7 @@
          	<para>[[ repeatIn(objects, 'a') ]]</para>
      			<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
         	<td>
-        			<blockTable colWidths="48.0,155.0,70.0,20.0,80.0,59.0,52.0,54.0" style="tbl_content">
+        			<blockTable colWidths="48.0,135.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_content">
       		<tr>
 	        	<td>
 	        		<blockTable colWidths="273.00,100.0,52.5,52.5,52.5" style="Table5">
@@ -139,7 +139,7 @@
 			            <para style="P9b"><u>[[sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			        </tr>
-	      			</blockTable>   
+	      			</blockTable>
 	        	</td>
         	</tr>
       		<tr>
@@ -147,7 +147,7 @@
 	          <td>
 	            <para style="P16"></para>
 	          </td>
-	 
+
 	          <td>
 	            <para style="P3">Balance Initial</para>
 	          </td>
@@ -169,13 +169,13 @@
 	          <td>
 	            <para style="P4">[[ (o.init_debit - o.init_credit) or '0.0' ]]</para>
 	          </td>
-	   
+
 	        </tr>
 	         <tr>[[ repeatIn(lines(o, data['form']), 'line') ]]
           <td>
             <para style="P3">[[ line['date']  ]]</para>
           </td>
- 
+
           <td>
             <para style="P3">[[ line['partner'] ]]</para>
           </td>
@@ -197,14 +197,14 @@
           <td>
             <para style="P4">[[ line['progress'] and line['progress'] or '0.0' ]]</para>
           </td>
-   
+
         </tr>
       	</blockTable>
         	</td>
         </tr>
      </blockTable>
-     
-      <blockTable colWidths="59.0,125.0,66.0,20.0,100.0,50.0,50.0,50.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+
+      <blockTable colWidths="59.0,105.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3_centre">Date</para>
@@ -229,17 +229,17 @@
           </td>
           <td>
             <para style="P4">Balance</para>
-          </td>          
+          </td>
           <td>
             <para style="P4">Currency</para>
-          </td>          
-  
+          </td>
+
         </tr>
         <tr>
         <para>[[ repeatIn(objects, 'a') ]]</para>
      			<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
         	<td>
-        		<blockTable colWidths="54.0,125.0,66.0,20.0,100.0,50.0,50.0,50.0,40.0" style="tbl_content" >
+        		<blockTable colWidths="54.0,105.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_content" >
       		<tr>
 	        	<td>
 	        		<blockTable colWidths="259.00,100.0,50.0,50.0,49.0,40.00" style="Table5">
@@ -256,18 +256,18 @@
 			            <para style="P9b"><u>[[sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			          <td>
-			          	
+
 			            <para style="P9b"><u> [[ sum_currency_amount_account(a, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			        </tr>
-	      			</blockTable>   
+	      			</blockTable>
 	        	</td>
         	</tr>
       		<tr>[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
 	          <td>
 	            <para style="P16"></para>
 	          </td>
-	 
+
 	          <td>
 	            <para style="P3">Balance Initial</para>
 	          </td>
@@ -292,7 +292,7 @@
 	          <td>
 	            <para style="P4"> </para>
 	          </td>
-   
+
         </tr>
         <tr>[[ repeatIn(lines(o, data['form']), 'line') ]]
           <td>
@@ -323,15 +323,15 @@
             <para style="P4">[[ line['amount_currency'] or  '0.0' ]] [[ line['currency_code'] ]]</para>
           </td>
 
-  
+
         </tr>
-      	</blockTable>  
+      	</blockTable>
         	</td>
         </tr>
        </blockTable>
-  
+
   </story>
-  
-    
-    
-</document>
+
+
+
+</document>
\ No newline at end of file
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index a2f17d7a640..16ddfa9a594 100755
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -24,39 +24,39 @@
 				<drawString x="37.20cm" y="0.90cm">Page <pageNumber/></drawString>
 
 				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-				
+
 
 			    <lineMode width="0.7"/>
 				<lines>1.3cm 24.9cm 38.3cm 24.9cm</lines>
 				<setFont name="Helvetica" size="8"/>
 			    </pageGraphics>
-           
+
     </pageTemplate>
   </template>
    <stylesheet>
-   
+
     <blockTableStyle id="tbl_header">
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-     
+
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
-    
+
     <blockTableStyle id="tbl_content">
-      
+
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/>
     </blockTableStyle>
-    
-   
+
+
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,0"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    
-    
+
+
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -92,10 +92,10 @@
     <paraStyle name="Index" fontName="Helvetica"/>
   </stylesheet>
   <story>
-    
-    
-  	 <blockTable colWidths="55.0,35.0,180.0, 90.0,30.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
-  	 
+
+
+  	 <blockTable colWidths="55.0,35.0,150.0, 90.0,60.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+
         <tr>
           <td>
           	<para style="P12"><font color="white"> </font></para>
@@ -145,10 +145,10 @@
         <tr>
         		<para>[[ repeatIn(objects, 'a') ]]</para>
      			<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-     			
+
         	<td>
-        	
-        		<blockTable colWidths="50.0,35.0,180.0, 90.0,30.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_content" >
+
+        		<blockTable colWidths="50.0,35.0,150.0, 90.0,60.0,345.0,50.0,69.0,72.0,64.0,58.0" style="tbl_content" >
       		<tr>
 	        	<td>
 	        		<blockTable colWidths="400.0,374.0,69.0,72.0,64.0,59.00" style="Table5">
@@ -165,18 +165,18 @@
 			            <para style="P9b"><u>[[ sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			          <td>
-			          	
+
 			            <para style="P9b"><u> [[ sum_currency_amount_account(o, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			        </tr>
-	      			</blockTable>   
+	      			</blockTable>
 	        	</td>
         	</tr>
       		<tr>[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
           <td>
             <para style="P3_content">Balance Initial</para>
           </td>
- 
+
           <td>
             <para style="P3_content"></para>
           </td>
@@ -207,13 +207,13 @@
           <td>
             <para style="P4_content"> </para>
           </td>
-   
-        </tr>	 
-        
+
+        </tr>
+
         <tr>
         	[[ repeatIn(lines(o, data['form']), 'line') ]]
           <td>
-            
+
             <para style="P2_content">[[ line['date'] ]]</para>
           </td>
           <td>
@@ -247,17 +247,17 @@
             <para style="P4_content">[[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]]</para>
           </td>
         </tr>
-        
-      	</blockTable> 
+
+      	</blockTable>
         </td>
         </tr>
-            
-      
-        
+
+
+
      </blockTable>
-     
-     
-      <blockTable colWidths="55.0,35.0,196.0,90.0,30.0,390.0,50.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+
+
+      <blockTable colWidths="55.0,35.0,166.0,90.0,60.0,390.0,50.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
           <para style="P12">
@@ -320,7 +320,7 @@
             <para style="P4">Balance</para>
           </td>
         </tr>
-        
+
         <tr>
         	<td>
         		<para>[[ repeatIn(objects, 'a') ]]</para>
@@ -342,14 +342,14 @@
 			            <para style="P9b"><u>[[sum_solde_account(o, data['form']) or '0.0' ]]</u></para>
 			          </td>
 			        </tr>
-	      			</blockTable>   
+	      			</blockTable>
 	        	</td>
         	</tr>
       		 <tr>[[ data['form']['soldeinit'] == True or removeParentNode('tr') ]]
           <td>
             <para style="P3_content"></para>
           </td>
- 
+
           <td>
             <para style="P3_content">Solde Initial</para>
           </td>
@@ -368,7 +368,7 @@
         <td>
             <para style="P3_content"></para>
           </td>
- 	  
+
           <td>
             <para style="P4_content">[[ o.init_debit or '0.0' ]]</para>
           </td>
@@ -378,7 +378,7 @@
           <td>
             <para style="P4_content">[[ o.init_debit - o.init_credit or '0.0' ]]</para>
           </td>
-   
+
         </tr>
         <tr>[[ repeatIn(lines(o, data['form']), 'line') ]]
           <td>
@@ -412,15 +412,15 @@
             <para style="P4_content">[[ line['progress'] and line['progress'] or '0.0' ]]</para>
           </td>
         </tr>
-      	
-      	</blockTable> 
+
+      	</blockTable>
         	</td>
         </tr>
-     </blockTable> 
+     </blockTable>
      <para style="P12">
       <font color="white"> </font>
     </para>
-     
-    
+
+
   </story>
-</document>
+</document>
\ No newline at end of file