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

[IMP] account : Improve the general_journal report 

bzr revid: sbh@tinyerp.com-20100720060719-8v7857b78d17t6dn
This commit is contained in:
sbh (Open ERP) 2010-07-20 11:37:19 +05:30
parent 6a3cea148d
commit a1e46372bd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,9 +127,10 @@ class common_report_header(object):
return ''
def _get_journal(self, data):
codes=[]
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()]
codes = [x for x, in self.cr.fetchall()]
return codes or ''
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/account/report/general_journal.rml
View File

@ -256,7 +256,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') ]]
<tr>