From d51be125baeb9c5eba5f50f62b649f741fb7759c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 19 Jul 2010 16:20:07 +0530
Subject: [PATCH] [IMP] account : Improve the partner_balance report

bzr revid: sbh@tinyerp.com-20100719105007-t2ibxy1dmt6vkop9
---
 addons/account/report/common_report_header.py | 5 +++--
 addons/account/report/partner_balance.py      | 2 ++
 addons/account/report/partner_balance.rml     | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py
index 0b45a0580b9..6dd4aab0f5e 100644
--- a/addons/account/report/common_report_header.py
+++ b/addons/account/report/common_report_header.py
@@ -128,8 +128,9 @@ class common_report_header(object):
             return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.name
         return ''
 
-    def _get_journal(self, journal_ids):
-        self.cr.execute('select code from account_journal where id IN %s',(tuple(journal_ids),))
+    def _get_journal(self, data):
+        if data.get('form', False) and data['form'].get('journal_ids', False):        
+            self.cr.execute('select code from account_journal where id IN %s',(tuple(data['form']['journal_ids']),))
         codes = [x for x, in self.cr.fetchall()]
         return codes or ''
 
diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py
index 1a24c1fb263..544b84fcf90 100644
--- a/addons/account/report/partner_balance.py
+++ b/addons/account/report/partner_balance.py
@@ -50,6 +50,8 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
             'get_journal': self._get_journal,
             'get_filter': self._get_filter,   
             'get_account': self._get_account,
+            'get_start_date':self._get_start_date,
+            'get_end_date':self._get_end_date,
         })
         ## Compute account list one time
     #
diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml
index fad87337e68..286e085e36f 100644
--- a/addons/account/report/partner_balance.rml
+++ b/addons/account/report/partner_balance.rml
@@ -199,7 +199,7 @@
 	<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 removeParentNode('para') ]]</para></td>
-		<td> <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data['form']['journal_ids']) ]) ]] </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">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
@@ -208,8 +208,8 @@
 	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>        	
 	        	</tr>        	
 	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ data['form']['date_from'] ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ data['form']['date_to'] ]]</para></td>        	
+	        		<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>        	
 	        	</tr>
         	</blockTable>
         	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]