From d8f8d345b75f5073b9d85bb14d88d00d31205279 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Wed, 11 May 2016 18:42:34 +0200 Subject: [PATCH] [FIX] account: print Trial Balance This applies commits 313bc91cf509353e5bdf8bf684589475527df7be and 2ad4bd4846074c4e4334aff13e32cc3335657c73 to Trial Balance report. opw-676061 --- addons/account/report/account_balance.py | 4 ++-- addons/account/wizard/account_report_trial_balance.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 825b978931c..4422ddd5db3 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -58,9 +58,9 @@ class ReportTrialBalance(models.AbstractModel): @api.multi def render_html(self, data): self.model = self.env.context.get('active_model') - docs = self.env[self.model].browse(self.env.context.get('active_id')) + docs = self.env[self.model].browse(self.env.context.get('active_ids', [])) display_account = data['form'].get('display_account') - accounts = self.env['account.account'].search([]) + accounts = docs if self.model == 'account.account' else self.env['account.account'].search([]) account_res = self.with_context(data['form'].get('used_context'))._get_accounts(accounts, display_account) docargs = { diff --git a/addons/account/wizard/account_report_trial_balance.py b/addons/account/wizard/account_report_trial_balance.py index 251c8c09dbc..18130183b21 100644 --- a/addons/account/wizard/account_report_trial_balance.py +++ b/addons/account/wizard/account_report_trial_balance.py @@ -12,4 +12,5 @@ class AccountBalanceReport(models.TransientModel): def _print_report(self, data): data = self.pre_print_report(data) - return self.env['report'].get_action(self, 'account.report_trialbalance', data=data) + records = self.env[data['model']].browse(data.get('ids', [])) + return self.env['report'].get_action(records, 'account.report_trialbalance', data=data)