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

[MERGE] fix translation on reports 

bzr revid: fp@tinyerp.com-20121112100457-c1briv28xzyllul9
This commit is contained in:
Fabien Pinckaers 2012-11-12 11:04:57 +01:00
parent 45f0d7b7b8 024b70b8c7
commit 39ed8b62e9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/report/account_financial_report.rml
View File

@ -170,12 +170,12 @@
<tr> <tr>
<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td> <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
<td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td> <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filters' and get_filter(data) ]]</para></td>
</tr> </tr>
<tr> <tr>
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> <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 '' ]]</para></td> <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
<td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para> <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filters' and get_filter(data) or removeParentNode('para') ]] </para>
<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
<tr> <tr>
<td><para style="terp_tblheader_General_Centre">Start Date</para></td> <td><para style="terp_tblheader_General_Centre">Start Date</para></td>

6
addons/account/report/account_general_ledger.py
View File

@ -299,10 +299,10 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
def _get_sortby(self, data): def _get_sortby(self, data):
if self.sortby == 'sort_date': if self.sortby == 'sort_date':
return 'Date' return self._translate('Date')
elif self.sortby == 'sort_journal_partner': elif self.sortby == 'sort_journal_partner':
return 'Journal & Partner' return self._translate('Journal & Partner')
return 'Date' return self._translate('Date')
report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/account_general_ledger.rml', parser=general_ledger, header='internal') report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/account_general_ledger.rml', parser=general_ledger, header='internal')
report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/account_general_ledger_landscape.rml', parser=general_ledger, header='internal landscape') report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/account_general_ledger_landscape.rml', parser=general_ledger, header='internal landscape')

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

@ -94,10 +94,10 @@ class common_report_header(object):
def _get_filter(self, data): def _get_filter(self, data):
if data.get('form', False) and data['form'].get('filter', False): if data.get('form', False) and data['form'].get('filter', False):
if data['form']['filter'] == 'filter_date': if data['form']['filter'] == 'filter_date':
return 'Date' return self._translate('Date')
elif data['form']['filter'] == 'filter_period': elif data['form']['filter'] == 'filter_period':
return 'Periods' return self._translate('Periods')
return 'No Filter' return self._translate('No Filters')
def _sum_debit_period(self, period_id, journal_id=None): def _sum_debit_period(self, period_id, journal_id=None):
journals = journal_id or self.journal_ids journals = journal_id or self.journal_ids