diff --git a/addons/account/report/account_financial_report.py b/addons/account/report/account_financial_report.py index 864c4bbc7d1..b2471ac0fb3 100644 --- a/addons/account/report/account_financial_report.py +++ b/addons/account/report/account_financial_report.py @@ -53,7 +53,8 @@ class report_account_common(report_sxw.rml_parse, common_report_header): account_obj = self.pool.get('account.account') currency_obj = self.pool.get('res.currency') ids2 = self.pool.get('account.financial.report')._get_children_by_order(self.cr, self.uid, [data['form']['account_report_id'][0]], context=data['form']['used_context']) - for report in self.pool.get('account.financial.report').browse(self.cr, self.uid, ids2, context=data['form']['used_context']): + new_context = dict(data['form']['used_context'], lang=self.context.get('lang', 'en_US')) + for report in self.pool.get('account.financial.report').browse(self.cr, self.uid, ids2, context=new_context): vals = { 'name': report.name, 'balance': report.balance * report.sign or 0.0, @@ -76,7 +77,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header): elif report.type == 'account_type' and report.account_type_ids: account_ids = account_obj.search(self.cr, self.uid, [('user_type','in', [x.id for x in report.account_type_ids])]) if account_ids: - for account in account_obj.browse(self.cr, self.uid, account_ids, context=data['form']['used_context']): + for account in account_obj.browse(self.cr, self.uid, account_ids, context=new_context): #if there are accounts to display, we add them to the lines with a level equals to their level in #the COA + 1 (to avoid having them with a too low level that would conflicts with the level of data #financial reports for Assets, liabilities...) diff --git a/addons/account/report/account_financial_report.rml b/addons/account/report/account_financial_report.rml index 1ee8d5b1858..4c5022d312b 100644 --- a/addons/account/report/account_financial_report.rml +++ b/addons/account/report/account_financial_report.rml @@ -170,13 +170,13 @@ Chart of Accounts Fiscal Year - Filter By [[ get_filter(data)!='No Filters' and get_filter(data) ]] + Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] - [[ get_filter(data)=='No Filters' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date End Date @@ -196,7 +196,7 @@ [[ get_end_period(data) or removeParentNode('para') ]] - +