From 7ebf5505186767681db85efae61d7b8ba8bd5368 Mon Sep 17 00:00:00 2001 From: eLBati Date: Thu, 23 Apr 2020 20:40:39 +0200 Subject: [PATCH 1/2] FIX account_financial_report_qweb trial balance: consider journals set in wizard --- account_financial_report_qweb/report/general_ledger.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/account_financial_report_qweb/report/general_ledger.py b/account_financial_report_qweb/report/general_ledger.py index 83dee086..91068c23 100644 --- a/account_financial_report_qweb/report/general_ledger.py +++ b/account_financial_report_qweb/report/general_ledger.py @@ -328,6 +328,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 += """ From 620c94dd6cf00c83de1bed5e2aa282b07533f494 Mon Sep 17 00:00:00 2001 From: SimoRubi Date: Wed, 18 Nov 2020 10:17:26 +0100 Subject: [PATCH 2/2] insert tuple in query without trailing comma --- account_financial_report_qweb/report/general_ledger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/account_financial_report_qweb/report/general_ledger.py b/account_financial_report_qweb/report/general_ledger.py index 91068c23..82db22bf 100644 --- a/account_financial_report_qweb/report/general_ledger.py +++ b/account_financial_report_qweb/report/general_ledger.py @@ -331,8 +331,8 @@ class GeneralLedgerReportCompute(models.TransientModel): if self.filter_journal_ids: sub_subquery_sum_amounts += """ AND - ml.journal_id IN %s - """ % (tuple(self.filter_journal_ids.ids,),) + ml.journal_id IN (%s) + """ % ', '.join(map(str, self.filter_journal_ids.ids)) if self.only_posted_moves: sub_subquery_sum_amounts += """