From 4ebda9c3df5a7571f5f55668576a17f089c1da64 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 9 Jul 2010 15:53:04 +0530
Subject: [PATCH] [IMP] account: General ledger with good title and author and
 make self query on set_context

bzr revid: mra@mra-laptop-20100709102304-084pjj6lw33znzyx
---
 addons/account/report/general_ledger.py       |  4 +--
 addons/account/report/general_ledger.rml      |  2 +-
 .../report/general_ledger_landscape.rml       | 34 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index 61ac6bf7310..737f20e62e5 100644
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -38,10 +38,11 @@ class general_ledger(rml_parse.rml_parse):
     def set_context(self, objects, data, ids, report_type=None):
         self.borne_date = self.get_min_date(data['form'])
         new_ids = ids
+        self.query = data['form']['query_line']
         if (data['model'] == 'ir.ui.menu'):
             new_ids = [data['form']['chart_account_id']]
         objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
-        super(general_ledger, self).set_context(objects, data, new_ids, report_type)
+        super(general_ledger, self).set_context(objects, data, new_ids, report_type=report_type)
 
     def __init__(self, cr, uid, name, context=None):
         if context is None:
@@ -122,7 +123,6 @@ class general_ledger(rml_parse.rml_parse):
 
         res = []
         ctx = self.context.copy()
-        self.query = form['query_line']
         if account and account.child_consol_ids: # add ids of consolidated childs also of selected account
             ctx['consolidate_childs'] = True
             ctx['account_id'] = account.id
diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index d09350071e4..1826d94019f 100644
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_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="General Ledger" author="OpenERP" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
 			<pageGraphics>
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index 9807ceff095..dd7ab1878d9 100644
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-   <template pageSize="(1120.5,767.8)" title="Test" author="Martin Simon" allowSplitting="20" >
+   <template pageSize="(1120.5,767.8)" title="General Ledger" author="Openerp" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
 			<pageGraphics>
@@ -177,7 +177,7 @@
       <font color="white"> </font>
     </para>
    <para>[[ repeatIn(objects, 'a') ]]</para>
-   
+
    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -187,7 +187,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    
+
     <blockTable colWidths="60.0,60.0,60.0,60.0,59.0,59.0,59.0,59.0,59.0" style="Table_Sub_Header_Content">
       <tr>
         <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
@@ -214,7 +214,7 @@
         <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] </para></td>
       </tr>
     </blockTable>
-    
+
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -224,7 +224,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-  
+
    	<blockTable colWidths="66.0,35.0,150.0, 90.0,60.0,335.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><para style="date">Date</para></td>
@@ -240,13 +240,13 @@
           <td><para style="P12"><font color="white"> </font></para><para style="P4">Currency</para></td>
        </tr>
     </blockTable>
-    
-    
-    
-     <section> 
-    
+
+
+
+     <section>
+
       <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-    
+
       <blockTable rowHeights="0.65cm" colWidths="66.0,35.0,150.0, 90.0,60.0,335.0,50.0,69.0,72.0,64.0,58.0" style="tbl_content">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
       	<tr>
         	<td>
@@ -286,9 +286,9 @@
 			<td><para style="P4_content">[[ formatLang(line['amount_currency'] or '')]] [[ line['currency_code'] ]]</para></td>
 		</tr>
 	  </blockTable>
-	
+
 	</section>
-     
+
     <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,378.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"><font color="white"> </font></para><para style="date">Date</para></td>
@@ -303,11 +303,11 @@
           <td><para style="P12"><font color="white"> </font></para><para style="P4">Balance</para></td>
        </tr>
 	</blockTable>
-	
+
 	<section>
-	
+
 		<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-		
+
 		<blockTable rowHeights="0.65cm" colWidths="66.0,35.0,166.0,90.0,60.0,378.0,50.0,69.0,72.0,64.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
         	<tr>
          		<td>
@@ -344,7 +344,7 @@
 				<td><para style="P4_content">[[ formatLang(line['progress']) ]]</para></td>
 			</tr>
 		</blockTable>
-	
+
 	</section>
  </story>
 </document>