diff --git a/account_analytic_report/__init__.py b/account_analytic_report/__init__.py
index c4e388b714..7660e7bf61 100644
--- a/account_analytic_report/__init__.py
+++ b/account_analytic_report/__init__.py
@@ -1,2 +1,3 @@
+from . import models
 from . import report
 from . import wizard
diff --git a/account_analytic_report/__manifest__.py b/account_analytic_report/__manifest__.py
index df556cca52..56164f4f8a 100644
--- a/account_analytic_report/__manifest__.py
+++ b/account_analytic_report/__manifest__.py
@@ -7,7 +7,7 @@
     "author": "APSL-Nagarro, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/account-analytic",
     "category": "Account",
-    "depends": ["analytic", "account_financial_report"],
+    "depends": ["account", "date_range", "report_xlsx"],
     "maintainers": ["BernatObrador", "miquelalzanillas"],
     "data": [
         "security/ir.model.access.csv",
@@ -17,6 +17,7 @@
         "report/templates/trial_balance_analytic.xml",
         "views/report_trial_balance_analytic.xml",
         "views/account_analytic_line.xml",
+        "report/templates/layouts.xml",
     ],
     "assets": {
         "web.assets_backend": [
diff --git a/account_analytic_report/models/__init__.py b/account_analytic_report/models/__init__.py
new file mode 100644
index 0000000000..d290327430
--- /dev/null
+++ b/account_analytic_report/models/__init__.py
@@ -0,0 +1,2 @@
+from . import account_group
+from . import ir_actions_report
diff --git a/account_analytic_report/models/account_group.py b/account_analytic_report/models/account_group.py
new file mode 100644
index 0000000000..db414b5ede
--- /dev/null
+++ b/account_analytic_report/models/account_group.py
@@ -0,0 +1,67 @@
+# ?? 2018 Forest and Biomass Romania SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, fields, models
+
+
+class AccountGroup(models.Model):
+    _inherit = "account.group"
+
+    group_child_ids = fields.One2many(
+        comodel_name="account.group", inverse_name="parent_id", string="Child Groups"
+    )
+    level = fields.Integer(compute="_compute_level", recursive=True)
+    account_ids = fields.One2many(
+        comodel_name="account.account", inverse_name="group_id", string="Accounts"
+    )
+    compute_account_ids = fields.Many2many(
+        "account.account",
+        recursive=True,
+        compute="_compute_group_accounts",
+        string="Compute accounts",
+        store=True,
+    )
+    complete_name = fields.Char(
+        "Full Name", compute="_compute_complete_name", recursive=True
+    )
+    complete_code = fields.Char(
+        "Full Code", compute="_compute_complete_code", recursive=True
+    )
+
+    @api.depends("name", "parent_id.complete_name")
+    def _compute_complete_name(self):
+        """Forms complete name of location from parent location to child location."""
+        for group in self:
+            if group.parent_id.complete_name:
+                group.complete_name = f"{group.parent_id.complete_name}/{group.name}"
+            else:
+                group.complete_name = group.name
+
+    @api.depends("code_prefix_start", "parent_id.complete_code")
+    def _compute_complete_code(self):
+        """Forms complete code of location from parent location to child location."""
+        for group in self:
+            if group.parent_id.complete_code:
+                group.complete_code = "{}/{}".format(
+                    group.parent_id.complete_code, group.code_prefix_start
+                )
+            else:
+                group.complete_code = group.code_prefix_start
+
+    @api.depends("parent_id", "parent_id.level")
+    def _compute_level(self):
+        for group in self:
+            if not group.parent_id:
+                group.level = 0
+            else:
+                group.level = group.parent_id.level + 1
+
+    @api.depends(
+        "account_ids",
+        "group_child_ids.compute_account_ids",
+    )
+    def _compute_group_accounts(self):
+        for one in self:
+            one.compute_account_ids = (
+                one.account_ids | one.group_child_ids.compute_account_ids
+            )
diff --git a/account_analytic_report/models/ir_actions_report.py b/account_analytic_report/models/ir_actions_report.py
new file mode 100644
index 0000000000..04a9139656
--- /dev/null
+++ b/account_analytic_report/models/ir_actions_report.py
@@ -0,0 +1,27 @@
+# Copyright 2020 Onestein (<https://www.onestein.eu>)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class IrActionsReport(models.Model):
+    _inherit = "ir.actions.report"
+
+    @api.model
+    def _prepare_account_financial_report_context(self, data):
+        lang = data and data.get("account_financial_report_lang") or ""
+        return dict(self.env.context or {}, lang=lang) if lang else False
+
+    @api.model
+    def _render_qweb_html(self, report_ref, docids, data=None):
+        context = self._prepare_account_financial_report_context(data)
+        obj = self.with_context(**context) if context else self
+        return super(IrActionsReport, obj)._render_qweb_html(
+            report_ref, docids, data=data
+        )
+
+    @api.model
+    def _render_xlsx(self, report_ref, docids, data=None):
+        context = self._prepare_account_financial_report_context(data)
+        obj = self.with_context(**context) if context else self
+        return super(IrActionsReport, obj)._render_xlsx(report_ref, docids, data=data)
diff --git a/account_analytic_report/report/__init__.py b/account_analytic_report/report/__init__.py
index db771ac683..d44d3bbb22 100644
--- a/account_analytic_report/report/__init__.py
+++ b/account_analytic_report/report/__init__.py
@@ -1,2 +1,3 @@
+from . import abstract_report_xlsx
 from . import trial_balance_analytic
 from . import trial_balance_analytic_xlsx
diff --git a/account_analytic_report/report/abstract_report_xlsx.py b/account_analytic_report/report/abstract_report_xlsx.py
new file mode 100644
index 0000000000..6534ac250a
--- /dev/null
+++ b/account_analytic_report/report/abstract_report_xlsx.py
@@ -0,0 +1,740 @@
+# Author: Julien Coux
+# Copyright 2016 Camptocamp SA
+# Copyright 2021 Tecnativa - Jo??o Marques
+# Copyright 2024 (APSL - NAGARRO) Bernat Obrador
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class AbstractReportXslx(models.AbstractModel):
+    _name = "report.account_analytic_report.abstract_report_xlsx"
+    _description = "Abstract XLSX Account Analytic Report"
+    _inherit = "report.report_xlsx.abstract"
+
+    def get_workbook_options(self):
+        vals = super().get_workbook_options()
+        vals.update({"constant_memory": True})
+        return vals
+
+    def generate_xlsx_report(self, workbook, data, objects):
+        # Initialize report variables
+        report_data = {
+            "workbook": None,
+            "sheet": None,  # main sheet which will contains report
+            "columns": None,  # columns of the report
+            "row_pos": None,  # row_pos must be incremented at each writing lines
+            "formats": None,
+        }
+        self._define_formats(workbook, report_data)
+        # Get report data
+        report_name = self._get_report_name(objects, data=data)
+        report_footer = self._get_report_footer()
+        filters = self._get_report_filters(objects)
+        report_data["columns"] = self._get_report_columns(objects)
+        report_data["workbook"] = workbook
+        report_data["sheet"] = workbook.add_worksheet(report_name[:31])
+        self._set_column_width(report_data)
+        # Fill report
+        report_data["row_pos"] = 0
+        self._write_report_title(report_name, report_data)
+        self._write_filters(filters, report_data)
+        self._generate_report_content(workbook, objects, data, report_data)
+        self._write_report_footer(report_footer, report_data)
+
+    def _define_formats(self, workbook, report_data):
+        """Add cell formats to current workbook.
+        Those formats can be used on all cell.
+        Available formats are :
+         * format_bold
+         * format_right
+         * format_right_bold_italic
+         * format_header_left
+         * format_header_center
+         * format_header_right
+         * format_header_amount
+         * format_amount
+         * format_percent_bold_italic
+         * format_total
+         * format_amount_total
+         * format_acc_type_total
+         * format_acc_type_amount_total
+        """
+        currency_id = self.env["res.company"]._default_currency_id()
+        report_data["formats"] = {
+            "format_bold": workbook.add_format({"bold": True}),
+            "format_right": workbook.add_format({"align": "right"}),
+            "format_left": workbook.add_format({"align": "left"}),
+            "format_right_bold_italic": workbook.add_format(
+                {"align": "right", "bold": True, "italic": True}
+            ),
+            "format_header_left": workbook.add_format(
+                {"bold": True, "border": True, "bg_color": "#FFFFCC"}
+            ),
+            "format_header_center": workbook.add_format(
+                {"bold": True, "align": "center", "border": True, "bg_color": "#FFFFCC"}
+            ),
+            "format_header_right": workbook.add_format(
+                {"bold": True, "align": "right", "border": True, "bg_color": "#FFFFCC"}
+            ),
+            "format_header_amount": workbook.add_format(
+                {"bold": True, "border": True, "bg_color": "#FFFFCC"}
+            ),
+            "format_amount": workbook.add_format(),
+            "format_amount_bold": workbook.add_format({"bold": True}),
+            "format_percent_bold_italic": workbook.add_format(
+                {"bold": True, "italic": True}
+            ),
+        }
+        report_data["formats"]["format_amount"].set_num_format(
+            "#,##0." + "0" * currency_id.decimal_places
+        )
+        report_data["formats"]["format_header_amount"].set_num_format(
+            "#,##0." + "0" * currency_id.decimal_places
+        )
+        report_data["formats"]["format_percent_bold_italic"].set_num_format("#,##0.00%")
+        report_data["formats"]["format_amount_bold"].set_num_format(
+            "#,##0." + "0" * currency_id.decimal_places
+        )
+        col_format_totals = {
+            "bold": True,
+            "bg_color": "#90cf00",
+            "border": True,
+        }
+
+        col_format_totals_by_acc_type = {
+            "bold": True,
+            "bg_color": "#D9EBD3",
+            "border": True,
+        }
+        report_data["formats"]["format_total"] = workbook.add_format(col_format_totals)
+        report_data["formats"]["format_amount_total"] = workbook.add_format(
+            col_format_totals
+        )
+        report_data["formats"]["format_amount_total"].set_num_format(
+            "#,##0." + "0" * currency_id.decimal_places
+        )
+
+        report_data["formats"]["format_acc_type_total"] = workbook.add_format(
+            col_format_totals_by_acc_type
+        )
+        report_data["formats"]["format_acc_type_amount_total"] = workbook.add_format(
+            col_format_totals_by_acc_type
+        )
+        report_data["formats"]["format_acc_type_amount_total"].set_num_format(
+            "#,##0." + "0" * currency_id.decimal_places
+        )
+
+    def _set_column_width(self, report_data):
+        """Set width for all defined columns.
+        Columns are defined with `_get_report_columns` method.
+        """
+        for position, column in report_data["columns"].items():
+            report_data["sheet"].set_column(position, position, column["width"])
+
+    def _write_report_title(self, title, report_data):
+        """Write report title on current line using all defined columns width.
+        Columns are defined with `_get_report_columns` method.
+        """
+        report_data["sheet"].merge_range(
+            report_data["row_pos"],
+            0,
+            report_data["row_pos"],
+            len(report_data["columns"]) - 1,
+            title,
+            report_data["formats"]["format_bold"],
+        )
+        report_data["row_pos"] += 3
+
+    def _write_report_footer(self, footer, report_data):
+        """Write report footer .
+        Columns are defined with `_get_report_columns` method.
+        """
+        if footer:
+            report_data["row_pos"] += 1
+            report_data["sheet"].merge_range(
+                report_data["row_pos"],
+                0,
+                report_data["row_pos"],
+                len(report_data["columns"]) - 1,
+                footer,
+                report_data["formats"]["format_left"],
+            )
+            report_data["row_pos"] += 1
+
+    def _write_filters(self, filters, report_data):
+        """Write one line per filters on starting on current line.
+        Columns number for filter name is defined
+        with `_get_col_count_filter_name` method.
+        Columns number for filter value is define
+        with `_get_col_count_filter_value` method.
+        """
+        col_name = 1
+        col_count_filter_name = self._get_col_count_filter_name()
+        col_count_filter_value = self._get_col_count_filter_value()
+        col_value = col_name + col_count_filter_name + 1
+        for title, value in filters:
+            report_data["sheet"].merge_range(
+                report_data["row_pos"],
+                col_name,
+                report_data["row_pos"],
+                col_name + col_count_filter_name - 1,
+                title,
+                report_data["formats"]["format_header_left"],
+            )
+            report_data["sheet"].merge_range(
+                report_data["row_pos"],
+                col_value,
+                report_data["row_pos"],
+                col_value + col_count_filter_value - 1,
+                value,
+            )
+            report_data["row_pos"] += 1
+        report_data["row_pos"] += 2
+
+    def write_array_title(self, title, report_data):
+        """Write array title on current line using all defined columns width.
+        Columns are defined with `_get_report_columns` method.
+        """
+        report_data["sheet"].merge_range(
+            report_data["row_pos"],
+            0,
+            report_data["row_pos"],
+            len(report_data["columns"]) - 1,
+            title,
+            report_data["formats"]["format_bold"],
+        )
+        report_data["row_pos"] += 1
+
+    def write_array_header(self, report_data):
+        """Write array header on current line using all defined columns name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        for col_pos, column in report_data["columns"].items():
+            report_data["sheet"].write(
+                report_data["row_pos"],
+                col_pos,
+                column["header"],
+                report_data["formats"]["format_header_center"],
+            )
+        report_data["row_pos"] += 1
+
+    def write_line(self, line_object, report_data):
+        """Write a line on current line using all defined columns field name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        for col_pos, column in report_data["columns"].items():
+            value = getattr(line_object, column["field"])
+            cell_type = column.get("type", "string")
+            if cell_type == "many2one":
+                report_data["sheet"].write_string(
+                    report_data["row_pos"],
+                    col_pos,
+                    value.name or "",
+                    report_data["formats"]["format_right"],
+                )
+            elif cell_type == "string":
+                if (
+                    hasattr(line_object, "account_group_id")
+                    and line_object.account_group_id
+                ):
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"],
+                        col_pos,
+                        value or "",
+                        report_data["formats"]["format_bold"],
+                    )
+                else:
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"], col_pos, value or ""
+                    )
+            elif cell_type == "amount":
+                if (
+                    hasattr(line_object, "account_group_id")
+                    and line_object.account_group_id
+                ):
+                    cell_format = report_data["formats"]["format_amount_bold"]
+                else:
+                    cell_format = report_data["formats"]["format_amount"]
+                report_data["sheet"].write_number(
+                    report_data["row_pos"], col_pos, float(value), cell_format
+                )
+            elif cell_type == "amount_currency":
+                if line_object.currency_id:
+                    format_amt = self._get_currency_amt_format(line_object, report_data)
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"], col_pos, float(value), format_amt
+                    )
+        report_data["row_pos"] += 1
+
+    def write_line_from_dict(self, line_dict, report_data):
+        """Write a line on current line"""
+        for col_pos, column in report_data["columns"].items():
+            value = line_dict.get(column["field"], False)
+            cell_type = column.get("type", "string")
+            if cell_type == "string":
+                if line_dict.get("type", "") == "group_type":
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"],
+                        col_pos,
+                        value or "",
+                        report_data["formats"]["format_bold"],
+                    )
+                else:
+                    if (
+                        not isinstance(value, str)
+                        and not isinstance(value, bool)
+                        and not isinstance(value, int)
+                    ):
+                        value = value and value.strftime("%d/%m/%Y")
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"], col_pos, value or ""
+                    )
+            elif cell_type == "amount":
+                if (
+                    line_dict.get("account_group_id", False)
+                    and line_dict["account_group_id"]
+                ):
+                    cell_format = report_data["formats"]["format_amount_bold"]
+                else:
+                    cell_format = report_data["formats"]["format_amount"]
+                if column["field"] == "accounts":
+                    value_to_write = value[column["id"]]
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"],
+                        col_pos,
+                        float(value_to_write),
+                        cell_format,
+                    )
+                else:
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"], col_pos, float(value), cell_format
+                    )
+            elif cell_type == "amount_currency":
+                if line_dict.get("currency_name", False):
+                    format_amt = self._get_currency_amt_format_dict(
+                        line_dict, report_data
+                    )
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"], col_pos, float(value), format_amt
+                    )
+            elif cell_type == "currency_name":
+                report_data["sheet"].write_string(
+                    report_data["row_pos"],
+                    col_pos,
+                    value or "",
+                    report_data["formats"]["format_right"],
+                )
+            else:
+                self.write_non_standard_column(cell_type, col_pos, value)
+        report_data["row_pos"] += 1
+
+    def write_initial_balance(self, my_object, label, report_data):
+        """Write a specific initial balance line on current line
+        using defined columns field_initial_balance name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        col_pos_label = self._get_col_pos_initial_balance_label()
+        report_data["sheet"].write(
+            report_data["row_pos"],
+            col_pos_label,
+            label,
+            report_data["formats"]["format_right"],
+        )
+        for col_pos, column in report_data["columns"].items():
+            if column.get("field_initial_balance"):
+                value = getattr(my_object, column["field_initial_balance"])
+                cell_type = column.get("type", "string")
+                if cell_type == "string":
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"], col_pos, value or ""
+                    )
+                elif cell_type == "amount":
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"],
+                        col_pos,
+                        float(value),
+                        report_data["formats"]["format_amount"],
+                    )
+                elif cell_type == "amount_currency":
+                    if my_object.currency_id:
+                        format_amt = self._get_currency_amt_format(
+                            my_object, report_data
+                        )
+                        report_data["sheet"].write_number(
+                            report_data["row_pos"], col_pos, float(value), format_amt
+                        )
+            elif column.get("field_currency_balance"):
+                value = getattr(my_object, column["field_currency_balance"])
+                cell_type = column.get("type", "string")
+                if cell_type == "many2one":
+                    if my_object.currency_id:
+                        report_data["sheet"].write_string(
+                            report_data["row_pos"],
+                            col_pos,
+                            value.name or "",
+                            report_data["formats"]["format_right"],
+                        )
+        report_data["row_pos"] += 1
+
+    def write_initial_balance_from_dict(self, my_object, label, report_data):
+        """Write a specific initial balance line on current line
+        using defined columns field_initial_balance name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        col_pos_label = self._get_col_pos_initial_balance_label()
+        report_data["sheet"].write(
+            report_data["row_pos"],
+            col_pos_label,
+            label,
+            report_data["formats"]["format_right"],
+        )
+        for col_pos, column in report_data["columns"].items():
+            if column.get("field_initial_balance"):
+                value = my_object.get(column["field_initial_balance"], False)
+                cell_type = column.get("type", "string")
+                if cell_type == "string":
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"], col_pos, value or ""
+                    )
+                elif cell_type == "amount":
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"],
+                        col_pos,
+                        float(value),
+                        report_data["formats"]["format_amount"],
+                    )
+                elif cell_type == "amount_currency":
+                    if my_object["currency_id"]:
+                        format_amt = self._get_currency_amt_format(
+                            my_object, report_data
+                        )
+                        report_data["sheet"].write_number(
+                            report_data["row_pos"], col_pos, float(value), format_amt
+                        )
+            elif column.get("field_currency_balance"):
+                value = my_object.get(column["field_currency_balance"], False)
+                cell_type = column.get("type", "string")
+                if cell_type == "many2one":
+                    if my_object["currency_id"]:
+                        report_data["sheet"].write_string(
+                            report_data["row_pos"],
+                            col_pos,
+                            value.name or "",
+                            report_data["formats"]["format_right"],
+                        )
+        report_data["row_pos"] += 1
+
+    def write_ending_balance(self, my_object, name, label, report_data):
+        """Write a specific ending balance line on current line
+        using defined columns field_final_balance name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        for i in range(0, len(report_data["columns"])):
+            report_data["sheet"].write(
+                report_data["row_pos"],
+                i,
+                "",
+                report_data["formats"]["format_header_right"],
+            )
+        row_count_name = self._get_col_count_final_balance_name()
+        col_pos_label = self._get_col_pos_final_balance_label()
+        report_data["sheet"].merge_range(
+            report_data["row_pos"],
+            0,
+            report_data["row_pos"],
+            row_count_name - 1,
+            name,
+            report_data["formats"]["format_header_left"],
+        )
+        report_data["sheet"].write(
+            report_data["row_pos"],
+            col_pos_label,
+            label,
+            report_data["formats"]["format_header_right"],
+        )
+        for col_pos, column in report_data["columns"].items():
+            if column.get("field_final_balance"):
+                value = getattr(my_object, column["field_final_balance"])
+                cell_type = column.get("type", "string")
+                if cell_type == "string":
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"],
+                        col_pos,
+                        value or "",
+                        report_data["formats"]["format_header_right"],
+                    )
+                elif cell_type == "amount":
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"],
+                        col_pos,
+                        float(value),
+                        report_data["formats"]["format_header_amount"],
+                    )
+                elif cell_type == "amount_currency":
+                    if my_object.currency_id:
+                        format_amt = self._get_currency_amt_header_format(
+                            my_object, report_data
+                        )
+                        report_data["sheet"].write_number(
+                            report_data["row_pos"], col_pos, float(value), format_amt
+                        )
+            elif column.get("field_currency_balance"):
+                value = getattr(my_object, column["field_currency_balance"])
+                cell_type = column.get("type", "string")
+                if cell_type == "many2one":
+                    if my_object.currency_id:
+                        report_data["sheet"].write_string(
+                            report_data["row_pos"],
+                            col_pos,
+                            value.name or "",
+                            report_data["formats"]["format_header_right"],
+                        )
+        report_data["row_pos"] += 1
+
+    def write_ending_balance_from_dict(self, my_object, name, label, report_data):
+        """Write a specific ending balance line on current line
+        using defined columns field_final_balance name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        for i in range(0, len(report_data["columns"])):
+            report_data["sheet"].write(
+                report_data["row_pos"],
+                i,
+                "",
+                report_data["formats"]["format_header_right"],
+            )
+        row_count_name = self._get_col_count_final_balance_name()
+        col_pos_label = self._get_col_pos_final_balance_label()
+        report_data["sheet"].merge_range(
+            report_data["row_pos"],
+            0,
+            report_data["row_pos"],
+            row_count_name - 1,
+            name,
+            report_data["formats"]["format_header_left"],
+        )
+        report_data["sheet"].write(
+            report_data["row_pos"],
+            col_pos_label,
+            label,
+            report_data["formats"]["format_header_right"],
+        )
+        for col_pos, column in report_data["columns"].items():
+            if column.get("field_final_balance"):
+                value = my_object.get(column["field_final_balance"], False)
+                cell_type = column.get("type", "string")
+                if cell_type == "string":
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"],
+                        col_pos,
+                        value or "",
+                        report_data["formats"]["format_header_right"],
+                    )
+                elif cell_type == "amount":
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"],
+                        col_pos,
+                        float(value),
+                        report_data["formats"]["format_header_amount"],
+                    )
+                elif cell_type == "amount_currency":
+                    if my_object["currency_id"]:
+                        format_amt = self._get_currency_amt_format_dict(
+                            my_object, report_data
+                        )
+                        report_data["sheet"].write_number(
+                            report_data["row_pos"], col_pos, float(value), format_amt
+                        )
+            elif column.get("field_currency_balance"):
+                value = my_object.get(column["field_currency_balance"], False)
+                cell_type = column.get("type", "string")
+                if cell_type == "many2one":
+                    if my_object["currency_id"]:
+                        report_data["sheet"].write_string(
+                            report_data["row_pos"],
+                            col_pos,
+                            value or "",
+                            report_data["formats"]["format_header_right"],
+                        )
+                elif cell_type == "currency_name":
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"],
+                        col_pos,
+                        value or "",
+                        report_data["formats"]["format_header_right"],
+                    )
+        report_data["row_pos"] += 1
+
+    def _get_currency_amt_format(self, line_object, report_data):
+        """Return amount format specific for each currency."""
+        if "account_group_id" in line_object and line_object["account_group_id"]:
+            format_amt = report_data["formats"]["format_amount_bold"]
+            field_prefix = "format_amount_bold"
+        else:
+            format_amt = report_data["formats"]["format_amount"]
+            field_prefix = "format_amount"
+        if "currency_id" in line_object and line_object.get("currency_id", False):
+            if isinstance(line_object["currency_id"], int):
+                currency = self.env["res.currency"].browse(line_object["currency_id"])
+            else:
+                currency = line_object["currency_id"]
+            field_name = f"{field_prefix}_{currency.name}"
+            if hasattr(self, field_name):
+                format_amt = getattr(self, field_name)
+            else:
+                format_amt = report_data["workbook"].add_format()
+                report_data["field_name"] = format_amt
+                format_amt.set_num_format(self._report_xlsx_currency_format(currency))
+        return format_amt
+
+    def _get_currency_amt_format_dict(self, line_dict, report_data):
+        """Return amount format specific for each currency."""
+        if line_dict.get("account_group_id", False) and line_dict["account_group_id"]:
+            format_amt = report_data["formats"]["format_amount_bold"]
+            field_prefix = "format_amount_bold"
+        else:
+            format_amt = report_data["formats"]["format_amount"]
+            field_prefix = "format_amount"
+        if line_dict.get("currency_id", False) and line_dict["currency_id"]:
+            if isinstance(line_dict["currency_id"], int):
+                currency = self.env["res.currency"].browse(line_dict["currency_id"])
+            else:
+                currency = line_dict["currency_id"]
+            field_name = f"{field_prefix}_{currency.name}"
+            if hasattr(self, field_name):
+                format_amt = getattr(self, field_name)
+            else:
+                format_amt = report_data["workbook"].add_format()
+                report_data["field_name"] = format_amt
+                format_amt.set_num_format(self._report_xlsx_currency_format(currency))
+        return format_amt
+
+    def _get_currency_amt_header_format(self, line_object, report_data):
+        """Return amount header format for each currency."""
+        format_amt = report_data["formats"]["format_header_amount"]
+        if line_object.currency_id:
+            field_name = "format_header_amount_%s" % line_object.currency_id.name
+            if hasattr(self, field_name):
+                format_amt = getattr(self, field_name)
+            else:
+                format_amt = report_data["workbook"].add_format(
+                    {"bold": True, "border": True, "bg_color": "#FFFFCC"}
+                )
+                report_data["field_name"] = format_amt
+                format_amount = "#,##0." + (
+                    "0" * line_object.currency_id.decimal_places
+                )
+                format_amt.set_num_format(format_amount)
+        return format_amt
+
+    def _get_currency_amt_header_format_dict(self, line_object, report_data):
+        """Return amount header format for each currency."""
+        format_amt = report_data["formats"]["format_header_amount"]
+        if line_object["currency_id"]:
+            field_name = "format_header_amount_%s" % line_object["currency_name"]
+            if hasattr(self, field_name):
+                format_amt = getattr(self, field_name)
+            else:
+                format_amt = report_data["workbook"].add_format(
+                    {"bold": True, "border": True, "bg_color": "#FFFFCC"}
+                )
+                report_data["field_name"] = format_amt
+                currency = self.env["res.currency"].browse(line_object["currency_id"])
+                format_amount = "#,##0." + ("0" * currency.decimal_places)
+                format_amt.set_num_format(format_amount)
+        return format_amt
+
+    def _generate_report_content(self, workbook, report, data, report_data):
+        """
+        Allow to fetch report content to be displayed.
+        """
+        raise NotImplementedError()
+
+    def _get_report_complete_name(self, report, prefix, data=None):
+        if report.company_id:
+            suffix = " - {} - {}".format(
+                report.company_id.name, report.company_id.currency_id.name
+            )
+            return prefix + suffix
+        return prefix
+
+    def _get_report_name(self, report, data=False):
+        """
+        Allow to define the report name.
+        Report name will be used as sheet name and as report title.
+        :return: the report name
+        """
+        raise NotImplementedError()
+
+    def _get_report_footer(self):
+        """
+        Allow to define the report footer.
+        :return: the report footer
+        """
+        return False
+
+    def _get_report_columns(self, report):
+        """
+        Allow to define the report columns
+        which will be used to generate report.
+        :return: the report columns as dict
+        :Example:
+        {
+            0: {'header': 'Simple column',
+                'field': 'field_name_on_my_object',
+                'width': 11},
+            1: {'header': 'Amount column',
+                 'field': 'field_name_on_my_object',
+                 'type': 'amount',
+                 'width': 14},
+        }
+        """
+        raise NotImplementedError()
+
+    def _get_report_filters(self, report):
+        """
+        :return: the report filters as list
+        :Example:
+        [
+            ['first_filter_name', 'first_filter_value'],
+            ['second_filter_name', 'second_filter_value']
+        ]
+        """
+        raise NotImplementedError()
+
+    def _get_col_count_filter_name(self):
+        """
+        :return: the columns number used for filter names.
+        """
+        raise NotImplementedError()
+
+    def _get_col_count_filter_value(self):
+        """
+        :return: the columns number used for filter values.
+        """
+        raise NotImplementedError()
+
+    def _get_col_pos_initial_balance_label(self):
+        """
+        :return: the columns position used for initial balance label.
+        """
+        raise NotImplementedError()
+
+    def _get_col_count_final_balance_name(self):
+        """
+        :return: the columns number used for final balance name.
+        """
+        raise NotImplementedError()
+
+    def _get_col_pos_final_balance_label(self):
+        """
+        :return: the columns position used for final balance label.
+        """
+        raise NotImplementedError()
+
+    def write_non_standard_column(self, cell_type, col_pos, value):
+        """
+        Write columns out of the columns type defined here.
+        """
+        raise NotImplementedError()
diff --git a/account_analytic_report/report/templates/layouts.xml b/account_analytic_report/report/templates/layouts.xml
new file mode 100644
index 0000000000..fb8a7db55d
--- /dev/null
+++ b/account_analytic_report/report/templates/layouts.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template id="html_container">
+        <link
+            href="/account_analytic_report/static/src/css/report_html.css"
+            rel="stylesheet"
+        />
+        <t t-set="body_classname" t-value="'container'" />
+        <t t-call="web.report_layout">
+            <t t-out="0" />
+        </t>
+    </template>
+    <template id="internal_layout">
+        <div class="article o_account_analytic_reports_page">
+            <link
+                href="/account_analytic_report/static/src/css/report.css"
+                rel="stylesheet"
+            />
+            <t t-out="0" />
+        </div>
+        <div class="footer">
+            <div class="row">
+                <div class="col-6 custom_footer">
+                    <span
+                        t-esc="context_timestamp(datetime.datetime.now()).strftime('%Y-%m-%d %H:%M')"
+                    />
+                </div>
+                <div class="col-6 text-right custom_footer">
+                    <ul class="list-inline">
+                        <li class="list-inline-item">
+                            <span class="page" />
+                        </li>
+                        <li class="list-inline-item">/</li>
+                        <li class="list-inline-item">
+                            <span class="topage" />
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </template>
+</odoo>
diff --git a/account_analytic_report/report/templates/trial_balance_analytic.xml b/account_analytic_report/report/templates/trial_balance_analytic.xml
index d83721f155..959d6baf67 100644
--- a/account_analytic_report/report/templates/trial_balance_analytic.xml
+++ b/account_analytic_report/report/templates/trial_balance_analytic.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+
     <template id="trial_balance_analytic">
-        <t t-call="account_financial_report.html_container">
+        <t t-call="account_analytic_report.html_container">
             <t t-foreach="docs" t-as="o">
-                <t t-call="account_financial_report.internal_layout">
-                    <t t-call="account_analytic_report.report_trial_balance_base" />
+                <t t-call="account_analytic_report.internal_layout">
+                    <t
+                        t-call="account_analytic_report.report_trial_analytic_balance_base"
+                    />
                 </t>
             </t>
         </t>
     </template>
-    <template id="report_trial_balance_base">
+
+    <template id="report_trial_analytic_balance_base">
         <!-- Saved flag fields into variables, used to define columns display -->
         <t t-set="foreign_currency" t-value="foreign_currency" />
         <t t-set="hierarchy_level" t-value="hierarchy_level" />
@@ -36,7 +40,7 @@
                 />
             </div>
             <!-- Display filters -->
-            <t t-call="account_analytic_report.report_trial_balance_filters" />
+            <t t-call="account_analytic_report.report_trial_analytic_balance_filters" />
         <div class="table" style="overflow-x: auto; width: 100%;">
             <div
                     class="act_as_table list_table"
@@ -45,7 +49,9 @@
             <!-- Display account lines -->
             <div class="act_as_table data_table" style="width: 100%;">
                 <!-- Display account header -->
-                <t t-call="account_analytic_report.report_trial_balance_lines_header" />
+                <t
+                        t-call="account_analytic_report.report_trial_analytic_balance_lines_header"
+                    />
                 <!-- Display each lines -->
                 <t t-foreach="trial_balance" t-as="balance">
                     <!-- Adapt -->
@@ -62,12 +68,14 @@
                     <t t-if="limit_hierarchy_level and hierarchy_level">
                         <t t-if="hierarchy_level > balance['level']">
                             <t
-                                    t-call="account_analytic_report.report_trial_balance_line"
+                                    t-call="account_analytic_report.report_trial_analytic_balance_line"
                                 />
                         </t>
                     </t>
                     <t t-else="">
-                        <t t-call="account_analytic_report.report_trial_balance_line" />
+                        <t
+                                t-call="account_analytic_report.report_trial_analytic_balance_line"
+                            />
                     </t>
                 </t>
                 <!-- Show total amounts by account type -->
@@ -83,7 +91,7 @@
         </div>
         </t>
     </template>
-    <template id="report_trial_balance_filters">
+    <template id="report_trial_analytic_balance_filters">
         <div class="act_as_table data_table" style="width: 100%;">
             <div class="act_as_row labels">
                 <div class="act_as_cell">Date range filter</div>
@@ -124,7 +132,7 @@
             </div>
         </div>
     </template>
-    <template id="report_trial_balance_lines_header">
+    <template id="report_trial_analytic_balance_lines_header">
         <!-- Display table headers for lines -->
         <div class="act_as_thead">
             <div class="act_as_row labels">
@@ -157,7 +165,7 @@
             </div>
         </div>
     </template>
-    <template id="report_trial_balance_line">
+    <template id="report_trial_analytic_balance_line">
 
         <t t-if="not group_by_analytic_account">
             <t t-set="account_id_field" t-value="'general_account_id'" />
diff --git a/account_analytic_report/report/trial_balance_analytic.py b/account_analytic_report/report/trial_balance_analytic.py
index 8e9f4ba039..28aeb2607c 100644
--- a/account_analytic_report/report/trial_balance_analytic.py
+++ b/account_analytic_report/report/trial_balance_analytic.py
@@ -9,7 +9,6 @@
 class TrialBalanceAnalyticReport(models.AbstractModel):
     _name = "report.account_analytic_report.trial_balance_analytic"
     _description = "Trial Balance Analytic Report"
-    _inherit = "report.account_financial_report.abstract_report"
 
     def _get_accounts_data(self, accounts_ids, group_by_field):
         if group_by_field == "general_account_id":
diff --git a/account_analytic_report/report/trial_balance_analytic_xlsx.py b/account_analytic_report/report/trial_balance_analytic_xlsx.py
index f54a15c125..6c40a89f2f 100644
--- a/account_analytic_report/report/trial_balance_analytic_xlsx.py
+++ b/account_analytic_report/report/trial_balance_analytic_xlsx.py
@@ -9,9 +9,9 @@
 
 
 class TrialBalanceXslx(models.AbstractModel):
-    _name = "report.a_f_r.report_trial_balance_analytic_xlsx"
+    _name = "report.a_a_r.report_trial_balance_analytic_xlsx"
     _description = "Trial Balance XLSX Report"
-    _inherit = "report.account_financial_report.abstract_report_xlsx"
+    _inherit = "report.account_analytic_report.abstract_report_xlsx"
 
     def _get_report_name(self, report, data=False):
         company_id = data.get("company_id", False)
@@ -25,40 +25,6 @@ def _get_report_name(self, report, data=False):
             report_name += f" [{account_code}]"
         return report_name
 
-    def _define_formats(self, workbook, report_data):
-        super()._define_formats(workbook, report_data)
-        currency_id = self.env["res.company"]._default_currency_id()
-        col_format_totals = {
-            "bold": True,
-            "bg_color": "#90cf00",
-            "border": True,
-        }
-
-        col_format_totals_by_acc_type = {
-            "bold": True,
-            "bg_color": "#D9EBD3",
-            "border": True,
-        }
-        report_data["formats"]["format_total"] = workbook.add_format(col_format_totals)
-        report_data["formats"]["format_amount_total"] = workbook.add_format(
-            col_format_totals
-        )
-        report_data["formats"]["format_amount_total"].set_num_format(
-            "#,##0." + "0" * currency_id.decimal_places
-        )
-
-        report_data["formats"]["format_acc_type_total"] = workbook.add_format(
-            col_format_totals_by_acc_type
-        )
-        report_data["formats"]["format_acc_type_amount_total"] = workbook.add_format(
-            col_format_totals_by_acc_type
-        )
-        report_data["formats"]["format_acc_type_amount_total"].set_num_format(
-            "#,##0." + "0" * currency_id.decimal_places
-        )
-
-        return True
-
     def _is_report_with_include_both_accounts(self, report):
         return report.account_ids and not report.group_by_analytic_account
 
@@ -275,73 +241,6 @@ def _get_values_from_report(self, report, data):
             "account_ids": res_data["account_ids"],
         }
 
-    def write_line_from_dict(self, line_dict, report_data):
-        if not (
-            report_data["account_code_list"]
-            and not report_data["group_by_analytic_account"]
-        ):
-            return super().write_line_from_dict(line_dict, report_data)
-        else:
-            for col_pos, column in report_data["columns"].items():
-                value = line_dict.get(column["field"], False)
-                cell_type = column.get("type", "string")
-                if cell_type == "string":
-                    if line_dict.get("type", "") == "group_type":
-                        report_data["sheet"].write_string(
-                            report_data["row_pos"],
-                            col_pos,
-                            value or "",
-                            report_data["formats"]["format_bold"],
-                        )
-                    else:
-                        if (
-                            not isinstance(value, str)
-                            and not isinstance(value, bool)
-                            and not isinstance(value, int)
-                        ):
-                            value = value and value.strftime("%d/%m/%Y")
-                        report_data["sheet"].write_string(
-                            report_data["row_pos"], col_pos, value or ""
-                        )
-                elif cell_type == "amount":
-                    if (
-                        line_dict.get("account_group_id", False)
-                        and line_dict["account_group_id"]
-                    ):
-                        cell_format = report_data["formats"]["format_amount_bold"]
-                    else:
-                        cell_format = report_data["formats"]["format_amount"]
-                    if column["field"] == "accounts":
-                        value_to_write = value[column["id"]]
-                        report_data["sheet"].write_number(
-                            report_data["row_pos"],
-                            col_pos,
-                            float(value_to_write),
-                            cell_format,
-                        )
-                    else:
-                        report_data["sheet"].write_number(
-                            report_data["row_pos"], col_pos, float(value), cell_format
-                        )
-                elif cell_type == "amount_currency":
-                    if line_dict.get("currency_name", False):
-                        format_amt = self._get_currency_amt_format_dict(
-                            line_dict, report_data
-                        )
-                        report_data["sheet"].write_number(
-                            report_data["row_pos"], col_pos, float(value), format_amt
-                        )
-                elif cell_type == "currency_name":
-                    report_data["sheet"].write_string(
-                        report_data["row_pos"],
-                        col_pos,
-                        value or "",
-                        report_data["formats"]["format_right"],
-                    )
-                else:
-                    self.write_non_standard_column(cell_type, col_pos, value)
-            report_data["row_pos"] += 1
-
     def _write_line_with_format(self, report_data, row, str_format, amount_format):
         for col_pos, column in report_data["columns"].items():
             value = row.get(column["field"], False)
diff --git a/account_analytic_report/reports.xml b/account_analytic_report/reports.xml
index df50cda93d..21c4edb48d 100644
--- a/account_analytic_report/reports.xml
+++ b/account_analytic_report/reports.xml
@@ -1,47 +1,45 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-        <!-- Trial Balance -->
-        <record
-        id="action_report_analytic_trial_balance_qweb"
-        model="ir.actions.report"
-    >
-            <field name="name">Trial Analytic Balance</field>
-            <field name="model">ac.trial.balance.report.wizard</field>
-            <field name="report_type">qweb-pdf</field>
-            <field
-            name="report_name"
-        >account_analytic_report.trial_balance_analytic</field>
-            <field
-            name="report_file"
-        >account_analytic_report.trial_balance_analytic</field>
-            <field
-            name="paperformat_id"
-            ref="account_financial_report.report_qweb_paperformat"
-        />
-        </record>
-        <record
-        id="action_report_analytic_trial_balance_html"
-        model="ir.actions.report"
-    >
-            <field name="name">Trial Analytic Balance</field>
-            <field name="model">ac.trial.balance.report.wizard</field>
-            <field name="report_type">qweb-html</field>
-            <field
-            name="report_name"
-        >account_analytic_report.trial_balance_analytic</field>
-            <field
-            name="report_file"
-        >account_analytic_report.trial_balance_analytic</field>
-        </record>
-        <record
-        id="action_report_analytic_trial_balance_xlsx"
-        model="ir.actions.report"
-    >
-            <field name="name">Trial Balance XLSX</field>
-            <field name="model">ac.trial.balance.report.wizard</field>
-            <field name="type">ir.actions.report</field>
-            <field name="report_name">a_f_r.report_trial_balance_analytic_xlsx</field>
-            <field name="report_type">xlsx</field>
-            <field name="report_file">report_trial_balance_analytic</field>
-        </record>
+
+    <!-- PDF REPORTS : paperformat -->
+    <record id="report_qweb_paperformat" model="report.paperformat">
+        <field name="name">Account Analytic report qweb paperformat</field>
+        <field name="default" eval="True" />
+        <field name="format">custom</field>
+        <field name="page_height">297</field>
+        <field name="page_width">210</field>
+        <field name="orientation">Portrait</field>
+        <field name="margin_top">12</field>
+        <field name="margin_bottom">8</field>
+        <field name="margin_left">5</field>
+        <field name="margin_right">5</field>
+        <field name="header_line" eval="False" />
+        <field name="header_spacing">10</field>
+        <field name="dpi">110</field>
+    </record>
+
+    <record id="action_report_analytic_trial_balance_qweb" model="ir.actions.report">
+        <field name="name">Trial Analytic Balance</field>
+        <field name="model">ac.trial.balance.report.wizard</field>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">account_analytic_report.trial_balance_analytic</field>
+        <field name="report_file">account_analytic_report.trial_balance_analytic</field>
+        <field name="paperformat_id" ref="report_qweb_paperformat" />
+    </record>
+    <record id="action_report_analytic_trial_balance_html" model="ir.actions.report">
+        <field name="name">Trial Analytic Balance</field>
+        <field name="model">ac.trial.balance.report.wizard</field>
+        <field name="report_type">qweb-html</field>
+        <field name="report_name">account_analytic_report.trial_balance_analytic</field>
+        <field name="report_file">account_analytic_report.trial_balance_analytic</field>
+    </record>
+
+    <record id="action_report_analytic_trial_balance_xlsx" model="ir.actions.report">
+        <field name="name">Trial Balance XLSX</field>
+        <field name="model">ac.trial.balance.report.wizard</field>
+        <field name="type">ir.actions.report</field>
+        <field name="report_name">a_a_r.report_trial_balance_analytic_xlsx</field>
+        <field name="report_type">xlsx</field>
+        <field name="report_file">report_trial_balance_analytic</field>
+    </record>
 </odoo>
diff --git a/account_analytic_report/static/src/css/report.css b/account_analytic_report/static/src/css/report.css
new file mode 100644
index 0000000000..4a70c693d3
--- /dev/null
+++ b/account_analytic_report/static/src/css/report.css
@@ -0,0 +1,116 @@
+a {
+    color: #00337b;
+}
+.act_as_table {
+    display: table !important;
+    background-color: white;
+}
+.act_as_row {
+    display: table-row !important;
+    page-break-inside: avoid;
+}
+.act_as_cell {
+    display: table-cell !important;
+    page-break-inside: avoid;
+}
+.act_as_thead {
+    display: table-header-group !important;
+}
+.act_as_tbody {
+    display: table-row-group !important;
+}
+.list_table,
+.data_table,
+.totals_table {
+    width: 100% !important;
+}
+.act_as_row.labels {
+    background-color: #f0f0f0 !important;
+}
+.list_table,
+.data_table,
+.totals_table,
+.list_table .act_as_row {
+    border-left: 0px;
+    border-right: 0px;
+    text-align: center;
+    font-size: 10px;
+    padding-right: 3px;
+    padding-left: 3px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+    border-collapse: collapse;
+}
+.totals_table {
+    font-weight: bold;
+    text-align: center;
+}
+.list_table .act_as_row.labels,
+.list_table .act_as_row.initial_balance,
+.list_table .act_as_row.lines {
+    border-color: grey !important;
+    border-bottom: 1px solid lightGrey !important;
+}
+.data_table .act_as_cell {
+    border: 1px solid lightGrey;
+    text-align: center;
+}
+.data_table .act_as_cell,
+.list_table .act_as_cell,
+.totals_table .act_as_cell {
+    word-wrap: break-word;
+}
+.data_table .act_as_row.labels,
+.totals_table .act_as_row.labels {
+    font-weight: bold;
+}
+.initial_balance .act_as_cell {
+    font-style: italic;
+}
+.account_title {
+    font-size: 11px;
+    font-weight: bold;
+}
+.account_title.labels {
+    background-color: #f0f0f0 !important;
+}
+.act_as_cell.amount {
+    word-wrap: normal;
+    text-align: right;
+}
+.act_as_cell.left {
+    text-align: left;
+}
+.act_as_cell.right {
+    text-align: right;
+}
+/*.list_table .act_as_cell {*/
+/*    border-right:1px solid lightGrey;  uncomment to active column lines */
+/*}*/
+.list_table .act_as_cell.first_column {
+    padding-left: 0px;
+    /*    border-left:1px solid lightGrey; uncomment to active column lines */
+}
+.overflow_ellipsis {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+}
+.custom_footer {
+    font-size: 7px !important;
+}
+.page_break {
+    page-break-inside: avoid;
+}
+
+.button_row {
+    padding-bottom: 10px;
+}
+
+.o_account_analytic_reports_page {
+    padding-top: 10px;
+    width: 90%;
+    margin-right: auto;
+    margin-left: auto;
+    font-family: Helvetica, Arial;
+}
diff --git a/account_analytic_report/static/src/css/report_html.css b/account_analytic_report/static/src/css/report_html.css
new file mode 100644
index 0000000000..ca8aa59fdb
--- /dev/null
+++ b/account_analytic_report/static/src/css/report_html.css
@@ -0,0 +1,7 @@
+/* Styles of html report */
+.account_title span {
+    font-size: 1rem !important;
+}
+.act_as_cell {
+    font-size: 0.9rem !important;
+}
diff --git a/account_analytic_report/static/src/js/report.esm.js b/account_analytic_report/static/src/js/report.esm.js
new file mode 100644
index 0000000000..535d43c085
--- /dev/null
+++ b/account_analytic_report/static/src/js/report.esm.js
@@ -0,0 +1,73 @@
+/** @odoo-module */
+
+import {useComponent, useEffect} from "@odoo/owl";
+
+function toTitleCase(str) {
+    return str
+        .replaceAll(".", " ")
+        .replace(
+            /\w\S*/g,
+            (txt) => `${txt.charAt(0).toUpperCase()}${txt.substr(1).toLowerCase()}`
+        );
+}
+
+function enrich(component, targetElement, selector, isIFrame = false) {
+    let doc = window.document;
+    let contentDocument = targetElement;
+
+    // If we are in an iframe, we need to take the right document
+    // both for the element and the doc
+    if (isIFrame) {
+        contentDocument = targetElement.contentDocument;
+        doc = contentDocument;
+    }
+
+    // If there are selector, we may have multiple blocks of code to enrich
+    const targets = [];
+    if (selector) {
+        targets.push(...contentDocument.querySelectorAll(selector));
+    } else {
+        targets.push(contentDocument);
+    }
+
+    // Search the elements with the selector, update them and bind an action.
+    for (const currentTarget of targets) {
+        const elementsToWrap = currentTarget.querySelectorAll("[res-model][domain]");
+        for (const element of elementsToWrap.values()) {
+            const wrapper = doc.createElement("a");
+            wrapper.setAttribute("href", "#");
+            wrapper.addEventListener("click", (ev) => {
+                ev.preventDefault();
+                component.env.services.action.doAction({
+                    type: "ir.actions.act_window",
+                    res_model: element.getAttribute("res-model"),
+                    domain: element.getAttribute("domain"),
+                    name: toTitleCase(element.getAttribute("res-model")),
+                    views: [
+                        [false, "list"],
+                        [false, "form"],
+                    ],
+                });
+            });
+            element.parentNode.insertBefore(wrapper, element);
+            wrapper.appendChild(element);
+        }
+    }
+}
+
+export function useEnrichWithActionLinks(ref, selector = null) {
+    const comp = useComponent();
+    useEffect(
+        (element) => {
+            // If we get an iframe, we need to wait until everything is loaded
+            if (element.matches("iframe")) {
+                element.addEventListener("load", () =>
+                    enrich(comp, element, selector, true)
+                );
+            } else {
+                enrich(comp, element, selector);
+            }
+        },
+        () => [ref.el]
+    );
+}
diff --git a/account_analytic_report/static/src/js/report_action.esm.js b/account_analytic_report/static/src/js/report_action.esm.js
new file mode 100644
index 0000000000..220b6758b1
--- /dev/null
+++ b/account_analytic_report/static/src/js/report_action.esm.js
@@ -0,0 +1,40 @@
+// /** @odoo-module **/
+import {ReportAction} from "@web/webclient/actions/reports/report_action";
+import {patch} from "@web/core/utils/patch";
+import {useEnrichWithActionLinks} from "./report.esm";
+
+const MODULE_NAME = "account_analytic_report";
+
+patch(ReportAction.prototype, {
+    setup() {
+        super.setup(...arguments);
+        this.isAccountAnalyticReport = this.props.report_name.startsWith(
+            `${MODULE_NAME}.`
+        );
+        useEnrichWithActionLinks(this.iframe);
+    },
+
+    export() {
+        this.action.doAction({
+            type: "ir.actions.report",
+            report_type: "xlsx",
+            report_name: this._get_xlsx_name(this.props.report_name),
+            report_file: this._get_xlsx_name(this.props.report_file),
+            data: this.props.data || {},
+            context: this.props.context || {},
+            display_name: this.title,
+        });
+    },
+
+    /**
+     * @param {String} str
+     * @returns {String}
+     */
+    _get_xlsx_name(str) {
+        if (typeof str !== "string") {
+            return str;
+        }
+        const parts = str.split(".");
+        return `a_a_r.report_${parts[parts.length - 1]}_xlsx`;
+    },
+});
diff --git a/account_analytic_report/views/report_trial_balance_analytic.xml b/account_analytic_report/views/report_trial_balance_analytic.xml
index 3322d05a8f..fa63a162dd 100644
--- a/account_analytic_report/views/report_trial_balance_analytic.xml
+++ b/account_analytic_report/views/report_trial_balance_analytic.xml
@@ -3,9 +3,9 @@
 <!-- # Copyright 2024 (APSL - Nagarro) Bernat Obrador
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
     <template id="report_trial_balance_analytic">
-        <div class="o_account_financial_reports_page">
-            <t t-call="account_financial_report.report_buttons" />
-            <t t-call="account_financial_report.report_trial_balance_base" />
+        <div class="o_account_analytic_reports_page">
+            <t t-call="report_buttons" />
+            <t t-call="report_trial_analytic_balance_base" />
         </div>
     </template>
 </odoo>
diff --git a/account_analytic_report/wizard/__init__.py b/account_analytic_report/wizard/__init__.py
index 801628b39d..a05be4935f 100644
--- a/account_analytic_report/wizard/__init__.py
+++ b/account_analytic_report/wizard/__init__.py
@@ -1 +1,2 @@
+from . import abstract_wizard
 from . import trial_balance_analytic_wizard_view
diff --git a/account_analytic_report/wizard/abstract_wizard.py b/account_analytic_report/wizard/abstract_wizard.py
new file mode 100644
index 0000000000..5378289043
--- /dev/null
+++ b/account_analytic_report/wizard/abstract_wizard.py
@@ -0,0 +1,31 @@
+# Copyright 2024 (APSL - Nagarro) Bernat Obrador
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class AbstractWizard(models.AbstractModel):
+    _name = "account_analytic_report_abstract_wizard"
+    _description = "Abstract Wizard"
+
+    company_id = fields.Many2one(
+        comodel_name="res.company",
+        default=lambda self: self.env.company.id,
+        required=False,
+        string="Company",
+    )
+
+    def button_export_html(self):
+        self.ensure_one()
+        report_type = "qweb-html"
+        return self._export(report_type)
+
+    def button_export_pdf(self):
+        self.ensure_one()
+        report_type = "qweb-pdf"
+        return self._export(report_type)
+
+    def button_export_xlsx(self):
+        self.ensure_one()
+        report_type = "xlsx"
+        return self._export(report_type)
diff --git a/account_analytic_report/wizard/trial_balance_analytic_wizard_view.py b/account_analytic_report/wizard/trial_balance_analytic_wizard_view.py
index 1f469a5a84..6fed9f966e 100644
--- a/account_analytic_report/wizard/trial_balance_analytic_wizard_view.py
+++ b/account_analytic_report/wizard/trial_balance_analytic_wizard_view.py
@@ -7,11 +7,9 @@
 
 
 class AnalyticTrialBalanceReportWizard(models.TransientModel):
-    """Trial balance report wizard."""
-
     _name = "ac.trial.balance.report.wizard"
     _description = "Analytic Trial Balance Report Wizard"
-    _inherit = "account_financial_report_abstract_wizard"
+    _inherit = "account_analytic_report_abstract_wizard"
 
     date_range_id = fields.Many2one(comodel_name="date.range", string="Date range")
     date_from = fields.Date(required=True)
@@ -126,7 +124,7 @@ def _print_report(self, report_type):
         self.ensure_one()
         data = self._prepare_report_trial_balance_analytic()
         if report_type == "xlsx":
-            report_name = "a_f_r.report_trial_balance_analytic_xlsx"
+            report_name = "a_a_r.report_trial_balance_analytic_xlsx"
         else:
             report_name = "account_analytic_report.trial_balance_analytic"
 
@@ -154,7 +152,7 @@ def _prepare_report_trial_balance_analytic(self):
             "company_id": self.company_id.id,
             "account_ids": sorted_accounts_ids or [],
             "fy_start_date": self.fy_start_date,
-            "account_financial_report_lang": self.env.lang,
+            "account_analytic_report_lang": self.env.lang,
             "plan_field": self.plan_id._column_name(),
             "plan_name": self.plan_id.name,
             "plan_id": self.plan_id.id,
diff --git a/account_analytic_report/wizard/trial_balance_analytic_wizard_view.xml b/account_analytic_report/wizard/trial_balance_analytic_wizard_view.xml
index fca61181a0..94acc3a5bd 100644
--- a/account_analytic_report/wizard/trial_balance_analytic_wizard_view.xml
+++ b/account_analytic_report/wizard/trial_balance_analytic_wizard_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <!-- # Copyright 2024 (APSL - Nagarro) Bernat Obrador
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
+    <!-- Copyright 2024 (APSL - Nagarro) Bernat Obrador
+ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
     <record id="analytic_trial_balance_wizard" model="ir.ui.view">
         <field name="name">Analytic Trial Balance</field>
         <field name="model">ac.trial.balance.report.wizard</field>