odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] account : Improve the partner_balance report 

bzr revid: sbh@tinyerp.com-20100719105007-t2ibxy1dmt6vkop9
This commit is contained in:
sbh (Open ERP) 2010-07-19 16:20:07 +05:30
parent 38c9b9e7a6
commit d51be125ba
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/account/report/common_report_header.py
View File

@ -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 ''

2
addons/account/report/partner_balance.py
View File

@ -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
#

6
addons/account/report/partner_balance.rml
View File

@ -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') ]]