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

[IMP] account: Improve the account_journal report 

bzr revid: sbh@tinyerp.com-20100721094757-aa3psqxyo50k6g9y
This commit is contained in:
sbh (Open ERP) 2010-07-21 15:17:57 +05:30
parent 21ed7a5f7a
commit 75929c345a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/account/report/account_journal.py
View File

@ -49,7 +49,8 @@ class journal_print(report_sxw.rml_parse, common_report_header):
'get_fiscalyear': self._get_fiscalyear,
'get_start_date':self._get_start_date,
'get_end_date':self._get_end_date,
'print_data':self._print_data,
'print_data':self._print_data,
'get_sortby': self._get_sortby,
})
@ -100,7 +101,15 @@ class journal_print(report_sxw.rml_parse, common_report_header):
def _print_data(self, data):
if data['model']=='account.journal.period':
return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).journal_id.currency or False
return data['form']['amount_currency']
return data['form']['amount_currency']
def _get_sortby(self, data):
if data.get('form', False) and data['form'].get('sort_selection', False):
if data['form']['sort_selection']=='date':
return 'Date'
elif data['form']['sort_selection'] == 'ref':
return 'Reference Number'
return super(journal_print ,self)._get_sortby(data)
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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

@ -239,7 +239,7 @@
</tr>
</blockTable>
</td>
<td><para style="terp_default_Centre_8">[[ data and 'form' in data and data['form']['sort_selection'] or 'Date' ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
</tr>
</blockTable>