odoo-addon-mis-builder 17.0.1.2.1.1__py3-none-any.whl → 18.0.1.0.0.11__py3-none-any.whl

odoo/addons/mis_builder/static/description/index.html

@@ -367,9 +367,9 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:b1c757f0e7b435600076d75a90bfb1bcc766368d4513957efb2316e2c3efd599
+!! source digest: sha256:4f951807886cf621fb36273acfadb6571fdb553df0d02b7a2574eceb88aa0058
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/mis-builder/tree/17.0/mis_builder"><img alt="OCA/mis-builder" src="https://img.shields.io/badge/github-OCA%2Fmis--builder-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/mis-builder-17-0/mis-builder-17-0-mis_builder"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/mis-builder&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/mis-builder/tree/18.0/mis_builder"><img alt="OCA/mis-builder" src="https://img.shields.io/badge/github-OCA%2Fmis--builder-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/mis-builder-18-0/mis-builder-18-0-mis_builder"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/mis-builder&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to build Management Information Systems
 dashboards. Such style of reports presents KPI in rows and time periods
 in columns. Reports mainly fetch data from account moves, but can also
@@ -1081,7 +1081,7 @@ previews. <a class="reference external" href="https://github.com/OCA/account-fin
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/mis-builder/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/mis-builder/issues/new?body=module:%20mis_builder%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/mis-builder/issues/new?body=module:%20mis_builder%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -1124,6 +1124,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <li>Hoang Diep &lt;<a class="reference external" href="mailto:hoang&#64;trobz.com">hoang&#64;trobz.com</a>&gt;</li>
 <li>Miquel Pascual &lt;<a class="reference external" href="mailto:mpascual&#64;apsl.net">mpascual&#64;apsl.net</a>&gt;</li>
 <li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
+<li>Chau Le &lt;<a class="reference external" href="mailto:chaulb&#64;trobz.com">chaulb&#64;trobz.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -1137,7 +1138,7 @@ mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/sbidoul"><img alt="sbidoul" src="https://github.com/sbidoul.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/mis-builder/tree/17.0/mis_builder">OCA/mis-builder</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/mis-builder/tree/18.0/mis_builder">OCA/mis-builder</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

odoo/addons/mis_builder/static/src/components/mis_report_widget.esm.js

@@ -1,5 +1,3 @@
-/** @odoo-module **/
-
 import {Component, onWillStart, useState, useSubEnv} from "@odoo/owl";
 import {useBus, useService} from "@web/core/utils/hooks";
 import {DateTimeInput} from "@web/core/datetime/datetime_input";
@@ -12,7 +10,6 @@ export class MisReportWidget extends Component {
     setup() {
         super.setup();
         this.orm = useService("orm");
-        this.user = useService("user");
         this.action = useService("action");
         this.view = useService("view");
         this.JSON = JSON;
@@ -21,7 +18,6 @@ export class MisReportWidget extends Component {
             pivot_date: null,
         });
         this.searchModel = new SearchModel(this.env, {
-            user: this.user,
             orm: this.orm,
             view: this.view,
         });
@@ -48,13 +44,14 @@ export class MisReportWidget extends Component {
             ],
             {context: this.context}
         );
+
         this.source_aml_model_name = result.source_aml_model_name;
         this.widget_show_filters = result.widget_show_filters;
         this.widget_show_settings_button = result.widget_show_settings_button;
-        this.widget_search_view_id =
-            result.widget_search_view_id && result.widget_search_view_id[0];
+        this.widget_search_view_id = result.widget_search_view_id?.[0];
         this.state.pivot_date = parseDate(result.pivot_date);
         this.widget_show_pivot_date = result.widget_show_pivot_date;
+
         if (this.showSearchBar) {
             // Initialize the search model
             await this.searchModel.load({
@@ -96,31 +93,25 @@ export class MisReportWidget extends Component {
          * of Odoo dashboards that are not designed to contain forms but
          * rather tree views or charts.
          */
-        var context = this.props.record.context;
+        const context = this.props.record.context;
         if (context.active_model === "mis.report.instance") {
             return context.active_id;
         }
     }
 
     get context() {
-        var ctx = super.context;
-        if (this.showSearchBar) {
-            ctx = {
-                ...ctx,
+        return {
+            ...super.context,
+            ...(this.showSearchBar && {
                 mis_analytic_domain: this.searchModel.searchDomain,
-            };
-        }
-        if (this.showPivotDate && this.state.pivot_date) {
-            ctx = {
-                ...ctx,
-                mis_pivot_date: this.state.pivot_date,
-            };
-        }
-        return ctx;
+            }),
+            ...(this.showPivotDate &&
+                this.state.pivot_date && {mis_pivot_date: this.state.pivot_date}),
+        };
     }
 
     async drilldown(event) {
-        const drilldown = $(event.target).data("drilldown");
+        const drilldown = JSON.parse(event.target.dataset.drilldown);
         const action = await this.orm.call(
             "mis.report.instance",
             "drilldown",

odoo/addons/mis_builder/static/src/components/mis_report_widget.scss

@@ -0,0 +1,68 @@
+.o_web_client {
+    .mis_builder_amount {
+        text-align: right;
+    }
+
+    .mis_builder_collabel {
+        text-align: center;
+    }
+
+    .mis_builder_rowlabel {
+        text-align: left;
+    }
+
+    .mis_builder {
+        a {
+            // we don't want the link color, to respect user styles
+            color: inherit;
+
+            &:hover {
+                // underline links on hover to give a visual cue
+                text-decoration: underline;
+            }
+        }
+    }
+}
+
+/* style for the control panel (search box and buttons) */
+
+.oe_mis_builder_cp {
+    display: flex;
+    flex-direction: row;
+    padding-bottom: 20px;
+
+    .oe_mis_builder_cp_left {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+    }
+
+    .oe_mis_builder_cp_right {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 2;
+        max-width: 1280px;
+
+        &_top {
+            display: flex;
+            flex-direction: row;
+        }
+
+        &_bottom {
+            display: flex;
+            flex-direction: row;
+        }
+
+        .oe_mis_builder_filter_buttons {
+            display: flex;
+            flex-grow: 1;
+            justify-content: flex-start;
+        }
+
+        .oe_mis_builder_action_buttons {
+            display: flex;
+            flex-grow: 1;
+            justify-content: flex-end;
+        }
+    }
+}

odoo/addons/mis_builder/static/src/components/mis_report_widget.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <templates>
-
     <t t-name="mis_builder.MisReportWidget">
         <div class="oe_mis_builder_content">
             <t t-if="state.mis_report_data">
                 <div class="oe_mis_builder_cp">
-                    <div class="oe_mis_builder_cp_left">
-                    </div>
+                    <div class="oe_mis_builder_cp_left" />
                     <div class="oe_mis_builder_cp_right">
                         <div class="oe_mis_builder_cp_right_top">
                             <SearchBar t-if="showSearchBar" />
@@ -18,7 +16,7 @@
                                     placeholder="'Base date...'"
                                     type="'date'"
                                     t-if="showPivotDate"
-                                    onChange="onDateTimeChanged.bind(this)"
+                                    onChange.bind="onDateTimeChanged"
                                 />
                             </div>
                             <div class="oe_mis_builder_action_buttons">
@@ -49,9 +47,7 @@
                                 t-key="row_index"
                                 class="oe_list_header_columns"
                             >
-                                <th class="oe_list_header_char">
-
-                                </th>
+                                <th class="oe_list_header_char" />
                                 <th
                                     t-foreach="row.cols"
                                     t-as="col"
@@ -59,10 +55,10 @@
                                     class="oe_list_header_char mis_builder_collabel"
                                     t-att-colspan="col.colspan"
                                 >
-                                    <t t-esc="col.label" />
+                                    <t t-out="col.label" />
                                     <t t-if="col.description">
                                         <br />
-                                        <t t-esc="col.description" />
+                                        <t t-out="col.description" />
                                     </t>
                                 </th>
                             </tr>
@@ -74,10 +70,10 @@
                                 t-key="row_index"
                             >
                                 <td t-att="{'style': row.style}">
-                                    <t t-esc="row.label" />
+                                    <t t-out="row.label" />
                                     <t t-if="row.description">
                                         <br />
-                                        <t t-esc="row.description" />
+                                        <t t-out="row.description" />
                                     </t>
                                 </td>
                                 <td
@@ -94,11 +90,11 @@
                                             t-on-click="drilldown"
                                             t-att-data-drilldown="JSON.stringify(cell.drilldown_arg)"
                                         >
-                                            <t t-esc="cell.val_r" />
+                                            <t t-out="cell.val_r" />
                                         </a>
                                     </t>
                                     <t t-if="!cell.drilldown_arg">
-                                        <t t-esc="cell.val_r" />
+                                        <t t-out="cell.val_r" />
                                     </t>
                                 </td>
                             </tr>
@@ -111,5 +107,4 @@
             </t>
         </div>
     </t>
-
 </templates>

odoo/addons/mis_builder/static/src/scss/report.scss

@@ -0,0 +1,49 @@
+.mis_table {
+    display: table;
+    width: 100%;
+    table-layout: fixed;
+
+    .mis_row {
+        display: table-row;
+        page-break-inside: avoid;
+        border-color: grey;
+        border-bottom: 1px solid lightGrey;
+    }
+
+    .mis_cell {
+        display: table-cell;
+        page-break-inside: avoid;
+
+        &.mis_collabel {
+            font-weight: bold;
+            background-color: #f0f0f0;
+            text-align: center;
+        }
+
+        &.mis_rowlabel {
+            text-align: left;
+            /* white-space: nowrap; */
+        }
+
+        &.mis_amount {
+            text-align: right;
+        }
+    }
+
+    &,
+    .mis_row {
+        border-left: 0;
+        border-right: 0;
+        text-align: left;
+        padding: 2px 3px;
+        border-collapse: collapse;
+    }
+}
+
+.mis_thead {
+    display: table-header-group;
+}
+
+.mis_tbody {
+    display: table-row-group;
+}

odoo/addons/mis_builder/tests/__init__.py

@@ -10,6 +10,7 @@ from . import test_kpi_data
 from . import test_mis_report_instance
 from . import test_mis_safe_eval
 from . import test_period_dates
+from . import test_pro_rata_read_group
 from . import test_render
 from . import test_simple_array
 from . import test_target_move

odoo/addons/mis_builder/tests/common.py

@@ -27,10 +27,8 @@ def assert_matrix(matrix, expected):
             raise AssertionError("too many rows")
         for j, cell, expected_val in _zip(row.iter_cells(), expected_row):
             assert (
-                cell and cell.val
-            ) == expected_val, "{} != {} in row {} col {}".format(
-                cell and cell.val, expected_val, i, j
-            )
+                (cell and cell.val) == expected_val
+            ), f"{cell and cell.val} != {expected_val} in row {i} col {j}"
 
 
 @tagged("doctest")

odoo/addons/mis_builder/tests/fake_models.py

@@ -1,7 +1,24 @@
-from odoo import models
+from odoo import fields, models
 
 
 class MisKpiDataTestItem(models.Model):
     _name = "mis.kpi.data.test.item"
     _inherit = "mis.kpi.data"
     _description = "MIS Kpi Data test item"
+
+
+class ProrataReadGroupThing(models.Model):
+    _name = "prorata.read.group.thing"
+    _inherit = "prorata.read_group.mixin"
+    _description = "Prorata Read Group Thing"
+
+    date_from = fields.Date(required=True)
+    date_to = fields.Date(required=True)
+    account_code = fields.Char(required=True)
+    debit = fields.Float()
+    credit = fields.Float()
+    company_id = fields.Many2one(
+        "res.company",
+        required=True,
+        default=lambda self: self.env.company,
+    )

odoo/addons/mis_builder/tests/test_aep.py

@@ -9,13 +9,9 @@ from odoo import fields
 from odoo.exceptions import UserError
 from odoo.tools.safe_eval import safe_eval
 
-from ..models import aep
 from ..models.accounting_none import AccountingNone
 from ..models.aep import AccountingExpressionProcessor as AEP
 from ..models.aep import _is_domain
-from .common import load_doctests
-
-load_tests = load_doctests(aep)
 
 
 class TestAEP(common.TransactionCase):
@@ -39,7 +35,7 @@ class TestAEP(common.TransactionCase):
         # create receivable bs account
         self.account_ar = self.account_model.create(
             {
-                "company_id": self.company.id,
+                "company_ids": self.company.ids,
                 "code": "400AR",
                 "name": "Receivable",
                 "account_type": "asset_receivable",
@@ -49,20 +45,12 @@ class TestAEP(common.TransactionCase):
         # create income pl account
         self.account_in = self.account_model.create(
             {
-                "company_id": self.company.id,
+                "company_ids": self.company.ids,
                 "code": "700IN",
                 "name": "Income",
                 "account_type": "income",
             }
         )
-        self.account_in_no_data = self.account_model.create(
-            {
-                "company_id": self.company.id,
-                "code": "700INNODATA",
-                "name": "Income (no data)",
-                "account_type": "income",
-            }
-        )
         # create journal
         self.journal = self.journal_model.create(
             {
@@ -85,7 +73,6 @@ class TestAEP(common.TransactionCase):
             amount=300,
             debit_acc=self.account_ar,
             credit_acc=self.account_in,
-            credit_quantity=3,
         )
         # create move in March this year
         self._create_move(
@@ -111,8 +98,6 @@ class TestAEP(common.TransactionCase):
         self.aep.parse_expr("crdp[700I%]")
         self.aep.parse_expr("bali[400%]")
         self.aep.parse_expr("bale[700%]")
-        self.aep.parse_expr("balp[700I%]")
-        self.aep.parse_expr("fldp.quantity[700%]")
         self.aep.parse_expr("balp[]" "[('account_id.code', '=', '400AR')]")
         self.aep.parse_expr(
             "balp[]" "[('account_id.account_type', '=', " " 'asset_receivable')]"
@@ -127,32 +112,17 @@ class TestAEP(common.TransactionCase):
         self.aep.parse_expr("bal_700IN")  # deprecated
         self.aep.parse_expr("bals[700IN]")  # deprecated
 
-    def _create_move(
-        self, date, amount, debit_acc, credit_acc, post=True, credit_quantity=0
-    ):
+    def _create_move(self, date, amount, debit_acc, credit_acc, post=True):
         move = self.move_model.create(
             {
                 "journal_id": self.journal.id,
                 "date": fields.Date.to_string(date),
                 "line_ids": [
+                    (0, 0, {"name": "/", "debit": amount, "account_id": debit_acc.id}),
                     (
                         0,
                         0,
-                        {
-                            "name": "/",
-                            "debit": amount,
-                            "account_id": debit_acc.id,
-                        },
-                    ),
-                    (
-                        0,
-                        0,
-                        {
-                            "name": "/",
-                            "credit": amount,
-                            "account_id": credit_acc.id,
-                            "quantity": credit_quantity,
-                        },
+                        {"name": "/", "credit": amount, "account_id": credit_acc.id},
                     ),
                 ],
             }
@@ -182,20 +152,6 @@ class TestAEP(common.TransactionCase):
         self.assertEqual(self.company.fiscalyear_last_day, 31)
         self.assertEqual(self.company.fiscalyear_last_month, "12")
 
-    def test_parse_expr_error_handling(self):
-        aep = AEP(self.company)
-        with self.assertRaises(UserError) as cm:
-            aep.parse_expr("fldi.quantity[700%]")
-        self.assertIn(
-            "`fld` can only be used with mode `p` (variation)", str(cm.exception)
-        )
-        with self.assertRaises(UserError) as cm:
-            aep.parse_expr("fldp[700%]")
-        self.assertIn("`fld` must have a field name", str(cm.exception))
-        with self.assertRaises(UserError) as cm:
-            aep.parse_expr("balp.quantity[700%]")
-        self.assertIn("`bal` cannot have a field name", str(cm.exception))
-
     def test_aep_basic(self):
         self.aep.done_parsing()
         # let's query for december
@@ -247,8 +203,6 @@ class TestAEP(common.TransactionCase):
         self.assertEqual(self._eval("bale[700IN]"), -300)
         # check result for non existing account
         self.assertIs(self._eval("bale[700NA]"), AccountingNone)
-        # check fldp.quantity
-        self.assertEqual(self._eval("fldp.quantity[700%]"), 3)
 
         # let's query for March
         self._do_queries(
@@ -280,8 +234,6 @@ class TestAEP(common.TransactionCase):
         self.assertEqual(self._eval("debp[400A%]"), 500)
         self.assertEqual(self._eval("bal_700IN"), -500)
         self.assertEqual(self._eval("bals[700IN]"), -800)
-        # check fldp.quantity
-        self.assertEqual(self._eval("fldp.quantity[700%]"), 0)
 
         # unallocated p&l from previous year
         self.assertEqual(self._eval("balu[]"), -100)
@@ -315,17 +267,6 @@ class TestAEP(common.TransactionCase):
         end = self._eval_by_account_id("bale[]")
         self.assertEqual(end, {self.account_ar.id: 900, self.account_in.id: -800})
 
-    def test_aep_by_account_no_data(self):
-        """Test that accounts with no data are not returned."""
-        self.aep.done_parsing()
-        self._do_queries(
-            datetime.date(self.curr_year, 3, 1), datetime.date(self.curr_year, 3, 31)
-        )
-        variation = self._eval("balp[700I%]")
-        self.assertEqual(variation, -500)
-        variation_by_account = self._eval_by_account_id("balp[700I%]")
-        self.assertEqual(variation_by_account, {self.account_in.id: -500})
-
     def test_aep_convenience_methods(self):
         initial = AEP.get_balances_initial(self.company, time.strftime("%Y") + "-03-01")
         self.assertEqual(
@@ -378,13 +319,10 @@ class TestAEP(common.TransactionCase):
         self.assertEqual(account_ids, {self.account_in.id})
         expr = "balp[700%]"
         account_ids = self.aep.get_account_ids_for_expr(expr)
-        self.assertEqual(account_ids, {self.account_in.id, self.account_in_no_data.id})
+        self.assertEqual(account_ids, {self.account_in.id})
         expr = "bali[400%], bale[700%]"  # subkpis combined expression
         account_ids = self.aep.get_account_ids_for_expr(expr)
-        self.assertEqual(
-            account_ids,
-            {self.account_in.id, self.account_ar.id, self.account_in_no_data.id},
-        )
+        self.assertEqual(account_ids, {self.account_in.id, self.account_ar.id})
 
     def test_get_aml_domain_for_expr(self):
         self.aep.done_parsing()

odoo/addons/mis_builder/tests/test_data_sources.py

@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 import odoo.tests.common as common
+from odoo import Command
 
 from ..models.accounting_none import AccountingNone
 from ..models.mis_report import CMP_DIFF
@@ -35,14 +36,6 @@ class TestMisReportInstanceDataSources(common.TransactionCase):
         move._post()
         return move
 
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        # Perform the tests with a brand new company to avoid intrusive data from other
-        # modules added to the default company
-        cls.company = cls.env["res.company"].create({"name": "Company Test"})
-        cls.env.user.company_id = cls.company
-
     def setUp(self):
         super().setUp()
         self.account_model = self.env["account.account"]
@@ -51,7 +44,7 @@ class TestMisReportInstanceDataSources(common.TransactionCase):
         # create receivable bs account
         self.account_ar = self.account_model.create(
             {
-                "company_id": self.env.user.company_id.id,
+                "company_ids": [Command.link(self.env.user.company_id.id)],
                 "code": "400AR",
                 "name": "Receivable",
                 "account_type": "asset_receivable",
@@ -61,7 +54,7 @@ class TestMisReportInstanceDataSources(common.TransactionCase):
         # create income account
         self.account_in = self.account_model.create(
             {
-                "company_id": self.env.user.company_id.id,
+                "company_ids": [Command.link(self.env.user.company_id.id)],
                 "code": "700IN",
                 "name": "Income",
                 "account_type": "income",
@@ -69,7 +62,7 @@ class TestMisReportInstanceDataSources(common.TransactionCase):
         )
         self.account_in2 = self.account_model.create(
             {
-                "company_id": self.env.user.company_id.id,
+                "company_ids": [Command.link(self.env.user.company_id.id)],
                 "code": "700IN2",
                 "name": "Income",
                 "account_type": "income",

odoo/addons/mis_builder/tests/test_kpi_data.py

@@ -18,6 +18,7 @@ class TestKpiData(TransactionCase):
         from .fake_models import MisKpiDataTestItem
 
         cls.loader.update_registry((MisKpiDataTestItem,))
+        cls.addClassCleanup(cls.loader.restore_registry)
 
         report = cls.env["mis.report"].create(dict(name="test report"))
         cls.kpi1 = cls.env["mis.report.kpi"].create(
@@ -71,11 +72,6 @@ class TestKpiData(TransactionCase):
             )
         )
 
-    @classmethod
-    def tearDownClass(cls):
-        cls.loader.restore_registry()
-        return super().tearDownClass()
-
     def test_kpi_data_name(self):
         self.assertEqual(self.kd11.name, "k1: 2017-05-01 - 2017-05-10")
         self.assertEqual(self.kd12.name, "k1: 2017-05-11 - 2017-05-20")