diff --git a/account_financial_report/report/aged_partner_balance.py b/account_financial_report/report/aged_partner_balance.py index a00d32ee..21d330fb 100644 --- a/account_financial_report/report/aged_partner_balance.py +++ b/account_financial_report/report/aged_partner_balance.py @@ -189,6 +189,9 @@ class AgedPartnerBalanceReportCompute(models.TransientModel): self.ensure_one() if report_type == 'xlsx': report_name = 'a_f_r.report_aged_partner_balance_xlsx' + elif report_type == 'qweb-html': + report_name = 'account_financial_report.' \ + 'report_aged_partner_balance_html_qweb' else: report_name = 'account_financial_report.' \ 'report_aged_partner_balance_qweb' diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py index db6512f3..5af9f600 100644 --- a/account_financial_report/report/general_ledger.py +++ b/account_financial_report/report/general_ledger.py @@ -219,6 +219,9 @@ class GeneralLedgerReportCompute(models.TransientModel): self.ensure_one() if report_type == 'xlsx': report_name = 'a_f_r.report_general_ledger_xlsx' + elif report_type == 'qweb-html': + report_name = 'account_financial_report.' \ + 'report_general_ledger_html_qweb' else: report_name = 'account_financial_report.' \ 'report_general_ledger_qweb' @@ -1224,7 +1227,7 @@ LEFT JOIN account_analytic_account aa ON ml.analytic_account_id = aa.id """ if self.filter_analytic_tag_ids: - query_inject_move_line += """ + query_inject_move_line += """ INNER JOIN move_lines_on_tags ON ml.id = move_lines_on_tags.ml_id """ diff --git a/account_financial_report/report/journal_ledger.py b/account_financial_report/report/journal_ledger.py index b72ce5bf..b8c9117d 100644 --- a/account_financial_report/report/journal_ledger.py +++ b/account_financial_report/report/journal_ledger.py @@ -589,6 +589,9 @@ class ReportJournalLedger(models.TransientModel): self.ensure_one() if report_type == 'xlsx': report_name = 'a_f_r.report_journal_ledger_xlsx' + elif report_type == 'qweb-html': + report_name = 'account_financial_report.' \ + 'report_journal_ledger_html_qweb' else: report_name = 'account_financial_report.' \ 'report_journal_ledger_qweb' diff --git a/account_financial_report/report/open_items.py b/account_financial_report/report/open_items.py index f1039151..05d5e4a0 100644 --- a/account_financial_report/report/open_items.py +++ b/account_financial_report/report/open_items.py @@ -155,6 +155,9 @@ class OpenItemsReportCompute(models.TransientModel): self.ensure_one() if report_type == 'xlsx': report_name = 'a_f_r.report_open_items_xlsx' + elif report_type == 'qweb-html': + report_name = 'account_financial_report.' \ + 'report_open_items_html_qweb' else: report_name = 'account_financial_report.' \ 'report_open_items_qweb' diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml index d6816058..f8b3cc7d 100644 --- a/account_financial_report/report/templates/aged_partner_balance.xml +++ b/account_financial_report/report/templates/aged_partner_balance.xml @@ -11,6 +11,10 @@ + + + + + + + + + +