From b803646c8a854468c85d2f5e048f39c078525b54 Mon Sep 17 00:00:00 2001 From: mpanarin Date: Thu, 19 Jul 2018 18:37:11 +0300 Subject: [PATCH] [ADD] 10.0 account_financial_report_qweb: add journal filter on Trial Balance --- account_financial_report_qweb/report/trial_balance.py | 2 ++ account_financial_report_qweb/wizard/trial_balance_wizard.py | 4 ++++ .../wizard/trial_balance_wizard_view.xml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/account_financial_report_qweb/report/trial_balance.py b/account_financial_report_qweb/report/trial_balance.py index af482199..9c2c3d8f 100644 --- a/account_financial_report_qweb/report/trial_balance.py +++ b/account_financial_report_qweb/report/trial_balance.py @@ -28,6 +28,7 @@ class TrialBalanceReport(models.TransientModel): company_id = fields.Many2one(comodel_name='res.company') filter_account_ids = fields.Many2many(comodel_name='account.account') filter_partner_ids = fields.Many2many(comodel_name='res.partner') + filter_journal_ids = fields.Many2many(comodel_name='account.journal') show_partner_details = fields.Boolean() # General Ledger Report Data fields, @@ -170,6 +171,7 @@ class TrialBalanceReportCompute(models.TransientModel): 'company_id': self.company_id.id, 'filter_account_ids': [(6, 0, account_ids.ids)], 'filter_partner_ids': [(6, 0, self.filter_partner_ids.ids)], + 'filter_journal_ids': [(6, 0, self.filter_journal_ids.ids)], 'fy_start_date': self.fy_start_date, } diff --git a/account_financial_report_qweb/wizard/trial_balance_wizard.py b/account_financial_report_qweb/wizard/trial_balance_wizard.py index b1617c27..677f8abe 100644 --- a/account_financial_report_qweb/wizard/trial_balance_wizard.py +++ b/account_financial_report_qweb/wizard/trial_balance_wizard.py @@ -49,6 +49,9 @@ class TrialBalanceReportWizard(models.TransientModel): comodel_name='res.partner', string='Filter partners', ) + journal_ids = fields.Many2many( + comodel_name="account.journal", + ) not_only_one_unaffected_earnings_account = fields.Boolean( readonly=True, @@ -151,6 +154,7 @@ class TrialBalanceReportWizard(models.TransientModel): 'company_id': self.company_id.id, 'filter_account_ids': [(6, 0, self.account_ids.ids)], 'filter_partner_ids': [(6, 0, self.partner_ids.ids)], + 'filter_journal_ids': [(6, 0, self.partner_ids.ids)], 'fy_start_date': self.fy_start_date, 'show_partner_details': self.show_partner_details, } diff --git a/account_financial_report_qweb/wizard/trial_balance_wizard_view.xml b/account_financial_report_qweb/wizard/trial_balance_wizard_view.xml index 3a33ccec..c609e214 100644 --- a/account_financial_report_qweb/wizard/trial_balance_wizard_view.xml +++ b/account_financial_report_qweb/wizard/trial_balance_wizard_view.xml @@ -27,6 +27,8 @@