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

[FIX]:the translation issue for the General journals" and "Centralizing journals" report 

bzr revid: ksa@tinyerp.com-20130405071410-3l4gmuv2zyh3jbet
This commit is contained in:
kirti savalia (OpenERP) 2013-04-05 12:44:10 +05:30
parent 45c6e55b4a
commit 3596726591
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,7 +221,7 @@
<blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2">
<tr>
<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></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">Journals</para></td>
<td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>

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

@ -22,6 +22,7 @@
import time
from common_report_header import common_report_header
from openerp.report import report_sxw
from openerp.tools.translate import _
class journal_print(report_sxw.rml_parse, common_report_header):
@ -190,10 +191,10 @@ class journal_print(report_sxw.rml_parse, common_report_header):
def _get_sortby(self, data):
if self.sort_selection == 'date':
return 'Date'
return _('Date')
elif self.sort_selection == 'ref':
return 'Reference Number'
return 'Date'
return _('Reference Number')
return _('Date')
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external')
report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external')

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

@ -187,7 +187,7 @@
<blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
<tr>
<td><para style="terp_tblheader_General_Centre"> [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para>
<para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></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">Journal</para></td>
<td><para style="terp_tblheader_General_Centre">Period</para></td>