← Back to branch summary

~openerp-dev/openobject-addons/6.1-opw-579152-ado

« back to all changes in this revision

Viewing changes to account/report/account_general_ledger.py

[MERGE] OPW 577045: account/hr_holidays: fix untranslated string and 'Filter By' display on account reports

Show diffs side-by-side

added added

removed removed

Lines of Context:
account/report/account_general_ledger.py
31
31
from report import report_sxw
32
32
from common_report_header import common_report_header
33
33
 
 
34
from tools.translate import _
 
35
 
34
36
class general_ledger(report_sxw.rml_parse, common_report_header):
35
37
    _name = 'report.account.general.ledger'
36
38
 
300
302
 
301
303
    def _get_sortby(self, data):
302
304
        if self.sortby == 'sort_date':
303
 
            return 'Date'
 
305
            return _('Date')
304
306
        elif self.sortby == 'sort_journal_partner':
305
 
            return 'Journal & Partner'
306
 
        return 'Date'
 
307
            return _('Journal & Partner')
 
308
        return _('Date')
307
309
 
308
310
report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/account_general_ledger.rml', parser=general_ledger, header='internal')
309
311
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')