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/tests/test_mis_report_instance.py

@@ -412,7 +412,7 @@ class TestMisReportInstance(common.HttpCase):
             .search(
                 [
                     ("code", "=like", "200%"),
-                    ("company_id", "=", self.env.ref("base.main_company").id),
+                    ("company_ids", "in", [self.env.ref("base.main_company").id]),
                 ]
             )
             .ids
@@ -429,10 +429,8 @@ class TestMisReportInstance(common.HttpCase):
             "account_id": account.id,
         }
         action_name = self.report_instance._get_drilldown_action_name(args)
-        expected_name = "{kpi} - {account} - {period}".format(
-            kpi=self.kpi1.description,
-            account=account.display_name,
-            period=period.display_name,
+        expected_name = (
+            f"{self.kpi1.description} - {account.display_name} - {period.display_name}"
         )
         assert action_name == expected_name
 
@@ -458,7 +456,7 @@ class TestMisReportInstance(common.HttpCase):
                     "arch": "<graph><field name='name'/></graph>",
                 },
                 {
-                    "name": "mis_report_test_drilldown_views_tree",
+                    "name": "mis_report_test_drilldown_views_list",
                     "model": model_name,
                     "arch": "<pivot><field name='name'/></pivot>",
                 },
@@ -477,19 +475,19 @@ class TestMisReportInstance(common.HttpCase):
                     "arch": "<form><field name='name'/></form>",
                 },
                 {
-                    "name": "mis_report_test_drilldown_views_tree",
+                    "name": "mis_report_test_drilldown_views_list",
                     "model": model_name,
-                    "arch": "<tree><field name='name'/></tree>",
+                    "arch": "<list><field name='name'/></list>",
                 },
             ]
         )
         action = self.report_instance.drilldown(
             dict(expr="balp[200%]", period_id=self.report_instance.period_ids[0].id)
         )
-        self.assertEqual(action["view_mode"], "tree,form,pivot,graph")
+        self.assertEqual(action["view_mode"], "list,form,pivot,graph")
         self.assertEqual(
             action["views"],
-            [[False, "tree"], [False, "form"], [False, "pivot"], [False, "graph"]],
+            [[False, "list"], [False, "form"], [False, "pivot"], [False, "graph"]],
         )
 
     def test_qweb(self):
@@ -504,12 +502,18 @@ class TestMisReportInstance(common.HttpCase):
 
     def test_xlsx(self):
         self.report_instance.export_xls()  # get action
-        test_reports.try_report(
-            self.env.cr,
-            self.env.uid,
-            "mis_builder.mis_report_instance_xlsx",
-            [self.report_instance.id],
-            report_type="xlsx",
+        with self.assertLogs("odoo.tools.test_reports", level="WARNING") as log_catcher:
+            test_reports.try_report(
+                self.env.cr,
+                self.env.uid,
+                "mis_builder.mis_report_instance_xlsx",
+                [self.report_instance.id],
+                report_type="xlsx",
+            )
+        self.assertIn(
+            'Report mis_builder.mis_report_instance_xlsx produced a "xlsx" chunk, '
+            "cannot examine it",
+            log_catcher.output[0],
         )
 
     def test_get_kpis_by_account_id(self):
@@ -518,7 +522,7 @@ class TestMisReportInstance(common.HttpCase):
             .search(
                 [
                     ("code", "=like", "200%"),
-                    ("company_id", "=", self.env.ref("base.main_company").id),
+                    ("company_ids", "in", [self.env.ref("base.main_company").id]),
                 ]
             )
             .ids

odoo/addons/mis_builder/tests/test_multi_company_aep.py

@@ -4,7 +4,7 @@
 import datetime
 
 import odoo.tests.common as common
-from odoo import fields
+from odoo import Command, fields
 from odoo.tools.safe_eval import safe_eval
 
 from ..models.accounting_none import AccountingNone
@@ -43,7 +43,7 @@ class TestMultiCompanyAEP(common.TransactionCase):
                 "account_ar_" + company_key,
                 self.account_model.create(
                     {
-                        "company_id": company.id,
+                        "company_ids": [Command.link(company.id)],
                         "code": "400AR",
                         "name": "Receivable",
                         "account_type": "asset_receivable",
@@ -57,7 +57,7 @@ class TestMultiCompanyAEP(common.TransactionCase):
                 "account_in_" + company_key,
                 self.account_model.create(
                     {
-                        "company_id": company.id,
+                        "company_ids": [Command.link(company.id)],
                         "code": "700IN",
                         "name": "Income",
                         "account_type": "income",

odoo/addons/mis_builder/tests/test_pro_rata_read_group.py

@@ -0,0 +1,105 @@
+# Copyright 2025 ACSONE SA/NV (<http://acsone.eu>)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo_test_helper import FakeModelLoader
+
+from odoo.tests import TransactionCase
+
+
+class TestProrataReadGroup(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.loader = FakeModelLoader(cls.env, cls.__module__)
+        cls.loader.backup_registry()
+        from .fake_models import ProrataReadGroupThing
+
+        cls.loader.update_registry((ProrataReadGroupThing,))
+        cls.addClassCleanup(cls.loader.restore_registry)
+
+        cls.thing_model = cls.env["prorata.read.group.thing"]
+        cls.thing_model.create(
+            {
+                "date_from": "2024-01-01",
+                "date_to": "2024-01-05",
+                "account_code": "A1",
+                "debit": 7,
+                "credit": 0,
+            }
+        )
+        cls.thing_model.create(
+            {
+                "date_from": "2024-01-01",
+                "date_to": "2024-01-20",
+                "account_code": "A1",
+                "debit": 200,
+                "credit": 0,
+            }
+        )
+        cls.thing_model.create(
+            {
+                "date_from": "2024-01-15",
+                "date_to": "2024-01-20",
+                "account_code": "A1",
+                "debit": 11,
+                "credit": 0,
+            }
+        )
+
+    def test_prorata_read_group(self):
+        """Test a pro-rata read_group with a date period."""
+        data = self.thing_model.read_group(
+            [("date", ">=", "2024-01-11"), ("date", "<=", "2024-01-20")],
+            fields=["debit", "credit", "account_code", "company_id"],
+            groupby=["account_code", "company_id"],
+            lazy=False,
+        )[0]
+        self.assertEqual(data["debit"], 111)
+        self.assertEqual(data["credit"], 0)
+        self.assertEqual(data["account_code"], "A1")
+        self.assertEqual(
+            data["company_id"], (self.env.company.id, self.env.company.name)
+        )
+
+    def test_read_group(self):
+        """Test a regular read_group without date filtering still works."""
+        data = self.thing_model.read_group(
+            domain=[],
+            fields=["debit", "credit", "account_code", "company_id"],
+            groupby=["account_code", "company_id"],
+            lazy=False,
+        )[0]
+        self.assertEqual(data["debit"], 218)
+        self.assertEqual(data["credit"], 0)
+        self.assertEqual(data["account_code"], "A1")
+        self.assertEqual(
+            data["company_id"], (self.env.company.id, self.env.company.name)
+        )
+
+    def test_prorata_read_group_internal(self):
+        """Test a regular _read_group without date filtering still works."""
+        data = self.thing_model._read_group(
+            domain=[("date", ">=", "2024-01-11"), ("date", "<=", "2024-01-20")],
+            groupby=["account_code", "company_id"],
+            aggregates=["debit:sum", "credit:sum"],
+        )
+        self.assertEqual(
+            data,
+            [
+                ("A1", self.env.company, 111, 0),
+            ],
+        )
+
+    def test_read_group_internal(self):
+        """Test a regular _read_group without date filtering still works."""
+        data = self.thing_model._read_group(
+            domain=[],
+            groupby=["account_code", "company_id"],
+            aggregates=["debit:sum", "credit:sum"],
+        )
+        self.assertEqual(
+            data,
+            [
+                ("A1", self.env.company, 218, 0),
+            ],
+        )

odoo/addons/mis_builder/views/mis_report.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record model="ir.ui.view" id="mis_report_view_tree">
-        <field name="name">mis.report.view.tree</field>
+    <record model="ir.ui.view" id="mis_report_view_list">
+        <field name="name">mis.report.view.list</field>
         <field name="model">mis.report</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
                 <field name="description" />
-            </tree>
+            </list>
         </field>
     </record>
 
@@ -31,7 +31,7 @@
                                 colspan="2"
                                 context="{'default_report_id': id}"
                             >
-                                <tree>
+                                <list>
                                     <field name="sequence" widget="handle" />
                                     <field name="description" />
                                     <field name="name" />
@@ -45,7 +45,7 @@
                                         invisible="type == 'str'"
                                     />
                                     <field name="expression" />
-                                </tree>
+                                </list>
                             </field>
                         </page>
                         <page string="Queries">
@@ -55,7 +55,7 @@
                                 colspan="2"
                                 context="{'default_report_id': id}"
                             >
-                                <tree editable="bottom">
+                                <list editable="bottom">
                                     <field name="name" />
                                     <field name="model_id" />
                                     <field
@@ -70,16 +70,16 @@
                                         domain="[('model_id', '=', model_id), ('ttype', 'in', ('date', 'datetime'))]"
                                     />
                                     <field name="domain" />
-                                </tree>
+                                </list>
                             </field>
                         </page>
                         <page string="Sub KPI's">
                             <field name="subkpi_ids" nolabel="1" colspan="2">
-                                <tree editable="bottom">
+                                <list editable="bottom">
                                     <field name="sequence" widget="handle" />
                                     <field name="description" />
                                     <field name="name" />
-                                </tree>
+                                </list>
                             </field>
                         </page>
                         <page string="Sub Reports">
@@ -89,13 +89,13 @@
                                 colspan="2"
                                 context="{'default_report_id': id}"
                             >
-                                <tree editable="bottom">
+                                <list editable="bottom">
                                     <field name="name" />
                                     <field
                                         name="subreport_id"
                                         domain="[('id', '!=', parent.id)]"
                                     />
-                                </tree>
+                                </list>
                             </field>
                         </page>
                     </notebook>
@@ -132,13 +132,13 @@
                                 nolabel="1"
                                 invisible="not multi"
                             >
-                                <tree editable="bottom">
+                                <list editable="bottom">
                                     <field
                                         name="subkpi_id"
                                         domain="[('report_id', '=', parent.report_id)]"
                                     />
                                     <field name="name" />
-                                </tree>
+                                </list>
                             </field>
                             <field
                                 name="expression"
@@ -166,36 +166,31 @@
                                 <p
                                 > The following special elements are recognized in the expressions
                                     to compute accounting data: <code
-                                    >{bal|crd|deb|pbal|nbal|fld}{pieu}(.fieldname)[account
+                                >{bal|crd|deb|pbal|nbal}{pieu}[account
                                     selector][journal items domain]</code>. </p>
                                 <ul>
                                     <li>
                                         <code>bal</code>, <code>crd</code>, <code
-                                        >deb</code>, <code>
-                                        pbal</code>, <code>nbal</code>, <code
-                                        >fld</code> : balance, debit, credit,
-                                        positive balance, negative balance,
-                                        other numerical field. </li>
+                                    >deb</code>, <code>
+                                        pbal</code>, <code
+                                    >nbal</code> : balance, debit, credit,
+                                        positive balance, negative balance. </li>
                                     <li>
                                         <code>p</code>, <code>i</code>, <code
-                                        >e</code> : respectively variation over the period,
+                                    >e</code> : respectively variation over the period,
                                         initial balance, ending balance </li>
-                                    <li>when <code
-                                        >fld</code> is used : a field name specifier
-                                        must be provided (e.g. <code
-                                        >fldp.quantity</code></li>
                                     <li> The <b
-                                        >account selector</b> is a like expression on the
+                                    >account selector</b> is a like expression on the
                                         account code (eg <code
-                                        >70%</code>, etc), or a domain over accounts
+                                    >70%</code>, etc), or a domain over accounts
                                         (eg <code
-                                        >[('code', 'like', '60%')]</code>). </li>
+                                    >[('code', 'like', '60%')]</code>). </li>
                                     <li> The <b
-                                        >journal items domain</b> is an Odoo domain filter on
+                                    >journal items domain</b> is an Odoo domain filter on
                                         journal items. </li>
                                     <li>
                                         <code>balu[]</code> : (<code
-                                        >u</code> for unallocated) is a special expression
+                                    >u</code> for unallocated) is a special expression
                                         that shows the unallocated profit/loss of previous fiscal
                                         years. </li>
                                 </ul>
@@ -203,7 +198,7 @@
                                     Expressions can involve other KPI, sub KPI and
                                     query results by name (eg <code>kpi1 + kpi2</code>,
                                     <code>kpi2.subkpi1</code>, <code
-                                    >query1.field1</code>).
+                                >query1.field1</code>).
                                 </p>
                                 <p>
                                     Additionally following variables are available
@@ -217,15 +212,15 @@
                                         similar to the python builtins. </li>
                                     <li>
                                         <code>datetime</code>, <code
-                                        >datetime</code>, <code
-                                        >dateutil</code> : the python modules. </li>
+                                    >datetime</code>, <code
+                                    >dateutil</code> : the python modules. </li>
                                     <li>
                                         <code>date_from</code>, <code
-                                        >date_to</code> : beginning and end date of the
+                                    >date_to</code> : beginning and end date of the
                                         period. </li>
                                     <li>
                                         <code
-                                        >AccountingNone</code> : a null value that behaves as 0 in
+                                    >AccountingNone</code> : a null value that behaves as 0 in
                                         arithmetic operations. </li>
                                 </ul>
                             </div>
@@ -234,19 +229,19 @@
                                 <ul>
                                     <li>
                                         <code
-                                        >bal[70]</code> : variation of the balance of account 70 over
+                                    >bal[70]</code> : variation of the balance of account 70 over
                                         the period (it is the same as <code
-                                        >balp[70]</code>. </li>
+                                    >balp[70]</code>. </li>
                                     <li>
                                         <code
-                                        >bali[70,60]</code> : initial balance of accounts 70 and 60. </li>
+                                    >bali[70,60]</code> : initial balance of accounts 70 and 60. </li>
                                     <li>
                                         <code
-                                        >bale[1%%]</code> : balance of accounts starting with 1 at
+                                    >bale[1%%]</code> : balance of accounts starting with 1 at
                                         end of period. </li>
                                     <li>
                                         <code
-                                        >crdp[40%]</code> : sum of all credits on accounts starting
+                                    >crdp[40%]</code> : sum of all credits on accounts starting
                                         with 40 during the period. </li>
                                     <li>
                                         <code>
@@ -270,7 +265,7 @@
                                         : balance of move lines related to tax grid 56. </li>
                                     <li>
                                         <code
-                                        >pbale[55%]</code> : sum of all ending balances of accounts
+                                    >pbale[55%]</code> : sum of all ending balances of accounts
                                         starting with 55 whose ending balance is positive. </li>
                                 </ul>
                             </div>
@@ -282,9 +277,9 @@
     </record>
     <record model="ir.actions.act_window" id="mis_report_view_action">
         <field name="name">MIS Report Templates</field>
-        <field name="view_id" ref="mis_report_view_tree" />
+        <field name="view_id" ref="mis_report_view_list" />
         <field name="res_model">mis.report</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
     </record>
     <menuitem
         id="mis_report_conf_menu"

odoo/addons/mis_builder/views/mis_report_instance.xml

@@ -22,11 +22,11 @@
             </form>
         </field>
     </record>
-    <record model="ir.ui.view" id="mis_report_instance_view_tree">
-        <field name="name">mis.report.instance.view.tree</field>
+    <record model="ir.ui.view" id="mis_report_instance_view_list">
+        <field name="name">mis.report.instance.view.list</field>
         <field name="model">mis.report.instance</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <button
                     type="object"
                     name="preview"
@@ -47,7 +47,7 @@
                 <field name="currency_id" groups="base.group_multi_currency" />
                 <field name="target_move" />
                 <field name="pivot_date" />
-            </tree>
+            </list>
         </field>
     </record>
     <record model="ir.ui.view" id="mis_report_instance_view_form">
@@ -136,9 +136,7 @@
                                 <group>
                                     <field name="date" />
                                 </group>
-                                <group>
-
-                                </group>
+                                <group />
                                 <field
                                     name="period_ids"
                                     nolabel="1"
@@ -146,15 +144,14 @@
                                     required="comparison_mode"
                                     context="{'default_report_instance_id': id}"
                                 >
-                                    <tree decoration-danger="not valid">
+                                    <list decoration-danger="not valid">
                                         <field name="sequence" widget="handle" />
                                         <field name="name" />
                                         <field name="source" />
                                         <field name="source_aml_model_id" />
                                         <field name="date_from" />
                                         <field name="date_to" />
-                                        <field name="valid" invisible="1" />
-                                    </tree>
+                                    </list>
                                 </field>
                             </group>
                         </page>
@@ -215,9 +212,9 @@
     </record>
     <record model="ir.actions.act_window" id="mis_report_instance_view_action">
         <field name="name">MIS Reports</field>
-        <field name="view_id" ref="mis_report_instance_view_tree" />
+        <field name="view_id" ref="mis_report_instance_view_list" />
         <field name="res_model">mis.report.instance</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
         <field name="domain">[('temporary', '=', False)]</field>
     </record>
     <menuitem
@@ -253,42 +250,42 @@
             <sheet position="after">
                 <footer>
                     <button
-                        type="object"
-                        name="save_report"
-                        string="Save"
-                        icon="fa-save"
-                        class="btn"
-                    />
+                    type="object"
+                    name="save_report"
+                    string="Save"
+                    icon="fa-save"
+                    class="btn"
+                />
                     <button
-                        type="object"
-                        name="preview"
-                        string="Preview"
-                        icon="fa-search"
-                        class="btn"
-                    />
+                    type="object"
+                    name="preview"
+                    string="Preview"
+                    icon="fa-search"
+                    class="btn"
+                />
                     <button
-                        type="object"
-                        name="print_pdf"
-                        string="Print"
-                        icon="fa-print"
-                        class="btn"
-                    />
+                    type="object"
+                    name="print_pdf"
+                    string="Print"
+                    icon="fa-print"
+                    class="btn"
+                />
                     <button
-                        type="object"
-                        name="export_xls"
-                        string="Export"
-                        icon="fa-download"
-                        class="btn"
-                    /> or <button string="Cancel" class="oe_link" special="cancel" />
+                    type="object"
+                    name="export_xls"
+                    string="Export"
+                    icon="fa-download"
+                    class="btn"
+                /> or <button string="Cancel" class="oe_link" special="cancel" />
                 </footer>
             </sheet>
         </field>
     </record>
     <record model="ir.actions.act_window" id="last_mis_report_instance_view_action">
         <field name="name">Last Reports Generated</field>
-        <field name="view_id" ref="mis_report_instance_view_tree" />
+        <field name="view_id" ref="mis_report_instance_view_list" />
         <field name="res_model">mis.report.instance</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
         <field name="domain">[('temporary', '=', True)]</field>
     </record>
     <menuitem
@@ -337,14 +334,14 @@
                             nolabel="1"
                             colspan="2"
                         >
-                            <tree editable="bottom">
+                            <list editable="bottom">
                                 <field name="sign" />
                                 <field
                                     name="period_to_sum_id"
                                     domain="[('report_instance_id', '=', parent.report_instance_id), ('id', '!=', parent.id)]"
                                     options="{'no_create': True, 'no_open': True}"
                                 />
-                            </tree>
+                            </list>
                         </field>
                         <field
                             name="source_sumcol_accdet"

odoo/addons/mis_builder/views/mis_report_style.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record model="ir.ui.view" id="mis_report_style_view_tree">
-        <field name="name">mis.report.style.view.tree</field>
+    <record model="ir.ui.view" id="mis_report_style_view_list">
+        <field name="name">mis.report.style.view.list</field>
         <field name="model">mis.report.style</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="mis_report_style_view_form" model="ir.ui.view">
@@ -62,9 +62,9 @@
     </record>
     <record model="ir.actions.act_window" id="mis_report_style_view_action">
         <field name="name">MIS Report Styles</field>
-        <field name="view_id" ref="mis_report_style_view_tree" />
+        <field name="view_id" ref="mis_report_style_view_list" />
         <field name="res_model">mis.report.style</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
     </record>
     <menuitem
         id="mis_report_style_view_menu"

odoo/addons/mis_builder/wizard/mis_builder_dashboard.py

@@ -46,8 +46,8 @@ class AddMisReportInstanceDashboard(models.TransientModel):
             .sudo()
             .create(
                 {
-                    "name": "mis.report.instance.result.view.action.%d"
-                    % self.env.context["active_id"],
+                    "name": f"mis.report.instance.result.view.action."
+                    f"{self.env.context['active_id']}",
                     "res_model": active_model,
                     "res_id": active_id,
                     "target": "current",
@@ -67,7 +67,7 @@ class AddMisReportInstanceDashboard(models.TransientModel):
         )
         arch = self.dashboard_id.view_id.arch
         if last_customization:
-            arch = self.env["ir.ui.view.custom"].browse(last_customization[0].id).arch
+            arch = last_customization[0].arch
         new_arch = etree.fromstring(arch)
         column = new_arch.xpath("//column")[0]
         # Due to native dashboard doesn't support form view