From fbaa45b0bf4ccae110e10ea74e6b33109fbdeabe Mon Sep 17 00:00:00 2001 From: eLBati Date: Thu, 23 Apr 2020 20:40:39 +0200 Subject: [PATCH] FIX account_financial_report_qweb trial balance: consider journals set in wizard --- account_financial_report/README.rst | 3 +++ account_financial_report/report/general_ledger.py | 5 +++++ account_financial_report/static/description/index.html | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/account_financial_report/README.rst b/account_financial_report/README.rst index c67fc13e..9cc613f6 100644 --- a/account_financial_report/README.rst +++ b/account_financial_report/README.rst @@ -115,6 +115,9 @@ Contributors * Pedro M. Baeza * Sergio Teruel +* `Druidoo `__: + + * Iván Todorovich Much of the work in this module was done at a sprint in Sorrento, Italy in April 2016. diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py index ce141f96..b1b3ed47 100644 --- a/account_financial_report/report/general_ledger.py +++ b/account_financial_report/report/general_ledger.py @@ -331,6 +331,11 @@ class GeneralLedgerReportCompute(models.TransientModel): sub_subquery_sum_amounts += """ AND at.include_initial_balance = TRUE """ + if self.filter_journal_ids: + sub_subquery_sum_amounts += """ + AND + ml.journal_id IN %s + """ % (tuple(self.filter_journal_ids.ids,),) if self.only_posted_moves: sub_subquery_sum_amounts += """ diff --git a/account_financial_report/static/description/index.html b/account_financial_report/static/description/index.html index 8f939aa2..696c590a 100644 --- a/account_financial_report/static/description/index.html +++ b/account_financial_report/static/description/index.html @@ -470,6 +470,10 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Sergio Teruel
    • +
  • Druidoo:
      +
    • Iván Todorovich
      • +
    +

    • Much of the work in this module was done at a sprint in Sorrento, Italy in April 2016.