odoo-addon-mis-builder 16.0.5.1.12.1__py3-none-any.whl → 16.0.5.2.0__py3-none-any.whl

odoo/addons/mis_builder/README.rst

@@ -7,7 +7,7 @@ MIS Builder
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:0905c54fc67af6b27dd21cebeffdfb327bf4c8f2179938b30b4943c499516ad5
+   !! source digest: sha256:2c8b76b489e5323dae1133488deb91d0bcbf86be319044b51399b56b566e3c8b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

odoo/addons/mis_builder/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "MIS Builder",
-    "version": "16.0.5.1.12",
+    "version": "16.0.5.2.0",
     "category": "Reporting",
     "summary": """
         Build 'Management Information System' Reports and Dashboards

odoo/addons/mis_builder/i18n/mis_builder.pot

@@ -64,8 +64,9 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form
 msgid ""
 "<code>bal</code>, <code>crd</code>, <code>deb</code>, <code>\n"
-"                                        pbal</code>, <code>nbal</code> : balance, debit, credit,\n"
-"                                        positive balance, negative balance."
+"                                        pbal</code>, <code>nbal</code>, <code>fld</code> : balance, debit, credit,\n"
+"                                        positive balance, negative balance,\n"
+"                                        other numerical field."
 msgstr ""
 
 #. module: mis_builder
@@ -1603,7 +1604,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form
 msgid ""
 "The following special elements are recognized in the expressions\n"
-"                                    to compute accounting data: <code>{bal|crd|deb|pbal|nbal}{pieu}[account\n"
+"                                    to compute accounting data: <code>{bal|crd|deb|pbal|nbal|fld}{pieu}(.fieldname)[account\n"
 "                                    selector][journal items domain]</code>."
 msgstr ""
 
@@ -1704,6 +1705,27 @@ msgstr ""
 msgid "You cannot sum period %s with itself."
 msgstr ""
 
+#. module: mis_builder
+#. odoo-python
+#: code:addons/mis_builder/models/aep.py:0
+#, python-format
+msgid "`%(field)s` cannot have a field name in expression %(expr)s"
+msgstr ""
+
+#. module: mis_builder
+#. odoo-python
+#: code:addons/mis_builder/models/aep.py:0
+#, python-format
+msgid "`fld` can only be used with mode `p` (variation) in expression %s"
+msgstr ""
+
+#. module: mis_builder
+#. odoo-python
+#: code:addons/mis_builder/models/aep.py:0
+#, python-format
+msgid "`fld` must have a field name in exression %s"
+msgstr ""
+
 #. module: mis_builder
 #. odoo-python
 #: code:addons/mis_builder/models/mis_report_instance.py:0
@@ -1744,6 +1766,13 @@ msgstr ""
 msgid "versus"
 msgstr ""
 
+#. module: mis_builder
+#: model_terms:ir.ui.view,arch_db:mis_builder.mis_report_view_kpi_form
+msgid ""
+"when <code>fld</code> is used : a field name specifier\n"
+"                                        must be provided (e.g. <code>fldp.quantity</code>"
+msgstr ""
+
 #. module: mis_builder
 #: model:ir.model.fields.selection,name:mis_builder.selection__mis_report_style__font_size__x-large
 msgid "x-large"

odoo/addons/mis_builder/models/aep.py

@@ -23,15 +23,65 @@ def _is_domain(s):
     return _DOMAIN_START_RE.match(s)
 
 
+class Accumulator:
+    """A simple class to accumulate debit, credit and custom field values.
+
+    >>> acc1 = Accumulator(["f1", "f2"])
+    >>> acc1.debit
+    AccountingNone
+    >>> acc1.credit
+    AccountingNone
+    >>> acc1.custom_fields
+    {'f1': AccountingNone, 'f2': AccountingNone}
+    >>> acc1.add_debit_credit(10, 20)
+    >>> acc1.debit, acc1.credit
+    (10, 20)
+    >>> acc1.add_custom_field("f1", 10)
+    >>> acc1.custom_fields
+    {'f1': 10, 'f2': AccountingNone}
+    >>> acc2 = Accumulator(["f1", "f2"])
+    >>> acc2.add_debit_credit(21, 31)
+    >>> acc2.add_custom_field("f2", 41)
+    >>> acc1 += acc2
+    >>> acc1.debit, acc1.credit
+    (31, 51)
+    >>> acc1.custom_fields
+    {'f1': 10, 'f2': 41}
+    """
+
+    def __init__(self, custom_field_names=()):
+        self.debit = AccountingNone
+        self.credit = AccountingNone
+        self.custom_fields = {
+            custom_field: AccountingNone for custom_field in custom_field_names
+        }
+
+    def add_debit_credit(self, debit, credit):
+        self.debit += debit
+        self.credit += credit
+
+    def add_custom_field(self, field, value):
+        self.custom_fields[field] += value
+
+    def __iadd__(self, other):
+        self.debit += other.debit
+        self.credit += other.credit
+        for field in self.custom_fields:
+            self.custom_fields[field] += other.custom_fields[field]
+        return self
+
+
 class AccountingExpressionProcessor:
     """Processor for accounting expressions.
 
-    Expressions of the form <field><mode>[accounts][optional move line domain]
+    Expressions of the form
+    <field><mode>(.fieldname)?[accounts][optional move line domain]
     are supported, where:
         * field is bal, crd, deb, pbal (positive balances only),
-          nbal (negative balance only)
+          nbal (negative balance only), fld (custom field)
         * mode is i (initial balance), e (ending balance),
           p (moves over period)
+        * .fieldname is used only with fldp and specifies the field name to sum
         * there is also a special u mode (unallocated P&L) which computes
           the sum from the beginning until the beginning of the fiscal year
           of the period; it is only meaningful for P&L accounts
@@ -45,6 +95,7 @@ class AccountingExpressionProcessor:
           over the period (it is the same as balp[70]);
         * bali[70,60]: balance of accounts 70 and 60 at the start of period;
         * bale[1%]: balance of accounts starting with 1 at end of period.
+        * fldp.quantity[60%]: sum of the quantity field of moves on accounts 60
 
     How to use:
         * repeatedly invoke parse_expr() for each expression containing
@@ -76,8 +127,9 @@ class AccountingExpressionProcessor:
     MODE_UNALLOCATED = "u"
 
     _ACC_RE = re.compile(
-        r"(?P<field>\bbal|\bpbal|\bnbal|\bcrd|\bdeb)"
+        r"(?P<field>\bbal|\bpbal|\bnbal|\bcrd|\bdeb|\bfld)"
         r"(?P<mode>[piseu])?"
+        r"(?P<fld_name>\.[a-zA-Z0-9_]+)?"
         r"\s*"
         r"(?P<account_sel>_[a-zA-Z0-9]+|\[.*?\])"
         r"\s*"
@@ -109,6 +161,8 @@ class AccountingExpressionProcessor:
         # a first query to get the initial balance and another
         # to get the variation, so it's a bit slower
         self.smart_end = True
+        # custom field to query and sum
+        self._custom_fields = set()
         # Account model
         self._account_model = self.env[account_model].with_context(active_test=False)
 
@@ -128,7 +182,7 @@ class AccountingExpressionProcessor:
     def _parse_match_object(self, mo):
         """Split a match object corresponding to an accounting variable
 
-        Returns field, mode, account domain, move line domain.
+        Returns field, mode, fld_name, account domain, move line domain.
         """
         domain_eval_context = {
             "ref": self.env.ref,
@@ -137,12 +191,16 @@ class AccountingExpressionProcessor:
             "datetime": datetime,
             "dateutil": dateutil,
         }
-        field, mode, account_sel, ml_domain = mo.groups()
+        field, mode, fld_name, account_sel, ml_domain = mo.groups()
         # handle some legacy modes
         if not mode:
             mode = self.MODE_VARIATION
         elif mode == "s":
             mode = self.MODE_END
+        # custom fields
+        if fld_name:
+            assert fld_name[0] == "."
+            fld_name = fld_name[1:]  # strip leading dot
         # convert account selector to account domain
         if account_sel.startswith("_"):
             # legacy bal_NNN%
@@ -165,7 +223,7 @@ class AccountingExpressionProcessor:
             ml_domain = tuple(safe_eval(ml_domain, domain_eval_context))
         else:
             ml_domain = tuple()
-        return field, mode, acc_domain, ml_domain
+        return field, mode, fld_name, acc_domain, ml_domain
 
     def parse_expr(self, expr):
         """Parse an expression, extracting accounting variables.
@@ -176,7 +234,7 @@ class AccountingExpressionProcessor:
         and mode.
         """
         for mo in self._ACC_RE.finditer(expr):
-            _, mode, acc_domain, ml_domain = self._parse_match_object(mo)
+            field, mode, fld_name, acc_domain, ml_domain = self._parse_match_object(mo)
             if mode == self.MODE_END and self.smart_end:
                 modes = (self.MODE_INITIAL, self.MODE_VARIATION, self.MODE_END)
             else:
@@ -184,6 +242,30 @@ class AccountingExpressionProcessor:
             for mode in modes:
                 key = (ml_domain, mode)
                 self._map_account_ids[key].add(acc_domain)
+            if field == "fld":
+                if mode != self.MODE_VARIATION:
+                    raise UserError(
+                        _(
+                            "`fld` can only be used with mode `p` (variation) "
+                            "in expression %s",
+                            expr,
+                        )
+                    )
+                if not fld_name:
+                    raise UserError(
+                        _("`fld` must have a field name in exression %s", expr)
+                    )
+                self._custom_fields.add(fld_name)
+            else:
+                if fld_name:
+                    raise UserError(
+                        _(
+                            "`%(field)s` cannot have a field name "
+                            "in expression %(expr)s",
+                            field=field,
+                            expr=expr,
+                        )
+                    )
 
     def done_parsing(self):
         """Replace account domains by account ids in map"""
@@ -210,7 +292,7 @@ class AccountingExpressionProcessor:
         """
         account_ids = set()
         for mo in self._ACC_RE.finditer(expr):
-            field, mode, acc_domain, ml_domain = self._parse_match_object(mo)
+            _, _, _, acc_domain, _ = self._parse_match_object(mo)
             account_ids.update(self._account_ids_by_acc_domain[acc_domain])
         return account_ids
 
@@ -224,7 +306,7 @@ class AccountingExpressionProcessor:
         aml_domains = []
         date_domain_by_mode = {}
         for mo in self._ACC_RE.finditer(expr):
-            field, mode, acc_domain, ml_domain = self._parse_match_object(mo)
+            field, mode, fld_name, acc_domain, ml_domain = self._parse_match_object(mo)
             aml_domain = list(ml_domain)
             account_ids = set()
             account_ids.update(self._account_ids_by_acc_domain[acc_domain])
@@ -240,6 +322,8 @@ class AccountingExpressionProcessor:
                 aml_domain.append(("credit", "<>", 0.0))
             elif field == "deb":
                 aml_domain.append(("debit", "<>", 0.0))
+            elif fld_name:
+                aml_domain.append((fld_name, "!=", False))
             aml_domains.append(expression.normalize_domain(aml_domain))
             if mode not in date_domain_by_mode:
                 date_domain_by_mode[mode] = self.get_aml_domain_for_dates(
@@ -315,8 +399,12 @@ class AccountingExpressionProcessor:
             aml_model = self.env[aml_model]
         aml_model = aml_model.with_context(active_test=False)
         company_rates = self._get_company_rates(date_to)
-        # {(domain, mode): {account_id: (debit, credit)}}
-        self._data = defaultdict(dict)
+        # {(domain, mode): {account_id: Accumulator}}
+        self._data = defaultdict(
+            lambda: defaultdict(
+                lambda: Accumulator(self._custom_fields),
+            )
+        )
         domain_by_mode = {}
         ends = []
         for key in self._map_account_ids:
@@ -338,7 +426,13 @@ class AccountingExpressionProcessor:
             try:
                 accs = aml_model.read_group(
                     domain,
-                    ["debit", "credit", "account_id", "company_id"],
+                    [
+                        "debit",
+                        "credit",
+                        "account_id",
+                        "company_id",
+                        *self._custom_fields,
+                    ],
                     ["account_id", "company_id"],
                     lazy=False,
                 )
@@ -364,7 +458,15 @@ class AccountingExpressionProcessor:
                 ):
                     # in initial mode, ignore accounts with 0 balance
                     continue
-                self._data[key][acc["account_id"][0]] = (debit * rate, credit * rate)
+                # due to branches, it's possible to have multiple groups
+                # with the same account_id, because multiple companies can
+                # use the same account
+                account_data = self._data[key][acc["account_id"][0]]
+                account_data.add_debit_credit(debit * rate, credit * rate)
+                for field_name in self._custom_fields:
+                    account_data.add_custom_field(
+                        field_name, acc[field_name] or AccountingNone
+                    )
         # compute ending balances by summing initial and variation
         for key in ends:
             domain, mode = key
@@ -372,11 +474,8 @@ class AccountingExpressionProcessor:
             variation_data = self._data[(domain, self.MODE_VARIATION)]
             account_ids = set(initial_data.keys()) | set(variation_data.keys())
             for account_id in account_ids:
-                di, ci = initial_data.get(account_id, (AccountingNone, AccountingNone))
-                dv, cv = variation_data.get(
-                    account_id, (AccountingNone, AccountingNone)
-                )
-                self._data[key][account_id] = (di + dv, ci + cv)
+                self._data[key][account_id] += initial_data[account_id]
+                self._data[key][account_id] += variation_data[account_id]
 
     def replace_expr(self, expr):
         """Replace accounting variables in an expression by their amount.
@@ -387,25 +486,30 @@ class AccountingExpressionProcessor:
         """
 
         def f(mo):
-            field, mode, acc_domain, ml_domain = self._parse_match_object(mo)
+            field, mode, fld_name, acc_domain, ml_domain = self._parse_match_object(mo)
             key = (ml_domain, mode)
             account_ids_data = self._data[key]
             v = AccountingNone
             account_ids = self._account_ids_by_acc_domain[acc_domain]
             for account_id in account_ids:
-                debit, credit = account_ids_data.get(
-                    account_id, (AccountingNone, AccountingNone)
-                )
+                entry = account_ids_data[account_id]
+                debit = entry.debit
+                credit = entry.credit
                 if field == "bal":
                     v += debit - credit
-                elif field == "pbal" and debit >= credit:
-                    v += debit - credit
-                elif field == "nbal" and debit < credit:
-                    v += debit - credit
+                elif field == "pbal":
+                    if debit >= credit:
+                        v += debit - credit
+                elif field == "nbal":
+                    if debit < credit:
+                        v += debit - credit
                 elif field == "deb":
                     v += debit
                 elif field == "crd":
                     v += credit
+                else:
+                    assert field == "fld"
+                    v += entry.custom_fields[fld_name]
             # in initial balance mode, assume 0 is None
             # as it does not make sense to distinguish 0 from "no data"
             if (
@@ -428,7 +532,7 @@ class AccountingExpressionProcessor:
         """
 
         def f(mo):
-            field, mode, acc_domain, ml_domain = self._parse_match_object(mo)
+            field, mode, fld_name, acc_domain, ml_domain = self._parse_match_object(mo)
             key = (ml_domain, mode)
             # first check if account_id is involved in
             # the current expression part
@@ -436,9 +540,9 @@ class AccountingExpressionProcessor:
                 return "(AccountingNone)"
             # here we know account_id is involved in acc_domain
             account_ids_data = self._data[key]
-            debit, credit = account_ids_data.get(
-                account_id, (AccountingNone, AccountingNone)
-            )
+            entry = account_ids_data[account_id]
+            debit = entry.debit
+            credit = entry.credit
             if field == "bal":
                 v = debit - credit
             elif field == "pbal":
@@ -455,6 +559,9 @@ class AccountingExpressionProcessor:
                 v = debit
             elif field == "crd":
                 v = credit
+            else:
+                assert field == "fld"
+                v = entry.custom_fields[fld_name]
             # in initial balance mode, assume 0 is None
             # as it does not make sense to distinguish 0 from "no data"
             if (
@@ -468,7 +575,7 @@ class AccountingExpressionProcessor:
         account_ids = set()
         for expr in exprs:
             for mo in self._ACC_RE.finditer(expr):
-                field, mode, acc_domain, ml_domain = self._parse_match_object(mo)
+                _, mode, _, acc_domain, ml_domain = self._parse_match_object(mo)
                 key = (ml_domain, mode)
                 account_ids_data = self._data[key]
                 for account_id in self._account_ids_by_acc_domain[acc_domain]:
@@ -488,7 +595,7 @@ class AccountingExpressionProcessor:
         aep.parse_expr(expr)
         aep.done_parsing()
         aep.do_queries(date_from, date_to)
-        return aep._data[((), mode)]
+        return {k: (v.debit, v.credit) for k, v in aep._data[((), mode)].items()}
 
     @classmethod
     def get_balances_initial(cls, companies, date):

odoo/addons/mis_builder/models/aggregate.py

@@ -64,11 +64,11 @@ def _min(*args):
     >>> min()
     Traceback (most recent call last):
       File "<stdin>", line 1, in ?
-    TypeError: min expected 1 arguments, got 0
+    TypeError: min expected at least 1 argument, got 0
     >>> _min()
     Traceback (most recent call last):
       File "<stdin>", line 1, in ?
-    TypeError: min expected 1 arguments, got 0
+    TypeError: min expected at least 1 argument, got 0
     >>> min([])
     Traceback (most recent call last):
       File "<stdin>", line 1, in ?
@@ -107,11 +107,11 @@ def _max(*args):
     >>> max()
     Traceback (most recent call last):
       File "<stdin>", line 1, in ?
-    TypeError: max expected 1 arguments, got 0
+    TypeError: max expected at least 1 argument, got 0
     >>> _max()
     Traceback (most recent call last):
       File "<stdin>", line 1, in ?
-    TypeError: max expected 1 arguments, got 0
+    TypeError: max expected at least 1 argument, got 0
     >>> max([])
     Traceback (most recent call last):
       File "<stdin>", line 1, in ?

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

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:0905c54fc67af6b27dd21cebeffdfb327bf4c8f2179938b30b4943c499516ad5
+!! source digest: sha256:2c8b76b489e5323dae1133488deb91d0bcbf86be319044b51399b56b566e3c8b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/16.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-16-0/mis-builder-16-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=16.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.

odoo/addons/mis_builder/tests/test_aep.py

@@ -9,9 +9,13 @@ 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):
@@ -66,6 +70,7 @@ 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(
@@ -83,6 +88,7 @@ class TestAEP(common.TransactionCase):
         self.aep.parse_expr("bali[700IN]")
         self.aep.parse_expr("bale[700IN]")
         self.aep.parse_expr("balp[700IN]")
+        self.aep.parse_expr("balp[700NA]")  # account that does not exist
         self.aep.parse_expr("bali[400AR]")
         self.aep.parse_expr("bale[400AR]")
         self.aep.parse_expr("balp[400AR]")
@@ -90,6 +96,7 @@ 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("fldp.quantity[700%]")
         self.aep.parse_expr("balp[]" "[('account_id.code', '=', '400AR')]")
         self.aep.parse_expr(
             "balp[]" "[('account_id.account_type', '=', " " 'asset_receivable')]"
@@ -104,17 +111,32 @@ 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):
+    def _create_move(
+        self, date, amount, debit_acc, credit_acc, post=True, credit_quantity=0
+    ):
         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": "/", "credit": amount, "account_id": credit_acc.id},
+                        {
+                            "name": "/",
+                            "debit": amount,
+                            "account_id": debit_acc.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "name": "/",
+                            "credit": amount,
+                            "account_id": credit_acc.id,
+                            "quantity": credit_quantity,
+                        },
                     ),
                 ],
             }
@@ -144,6 +166,20 @@ 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
@@ -193,6 +229,10 @@ class TestAEP(common.TransactionCase):
         # check ending balance
         self.assertEqual(self._eval("bale[400AR]"), 400)
         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(
@@ -224,12 +264,19 @@ 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)
-
         # TODO allocate profits, and then...
 
+        # let's query for December where there is no data
+        self._do_queries(
+            datetime.date(self.curr_year, 12, 1), datetime.date(self.curr_year, 12, 31)
+        )
+        self.assertIs(self._eval("balp[700IN]"), AccountingNone)
+
     def test_aep_by_account(self):
         self.aep.done_parsing()
         self._do_queries(

odoo/addons/mis_builder/views/mis_report.xml

@@ -170,19 +170,24 @@
                                 <p
                                 > The following special elements are recognized in the expressions
                                     to compute accounting data: <code
-                                    >{bal|crd|deb|pbal|nbal}{pieu}[account
+                                    >{bal|crd|deb|pbal|nbal|fld}{pieu}(.fieldname)[account
                                     selector][journal items domain]</code>. </p>
                                 <ul>
                                     <li>
                                         <code>bal</code>, <code>crd</code>, <code
                                         >deb</code>, <code>
-                                        pbal</code>, <code
-                                        >nbal</code> : balance, debit, credit,
-                                        positive balance, negative balance. </li>
+                                        pbal</code>, <code>nbal</code>, <code
+                                        >fld</code> : balance, debit, credit,
+                                        positive balance, negative balance,
+                                        other numerical field. </li>
                                     <li>
                                         <code>p</code>, <code>i</code>, <code
                                         >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 code (eg <code

{odoo_addon_mis_builder-16.0.5.1.12.1.dist-info → odoo_addon_mis_builder-16.0.5.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-mis_builder
-Version: 16.0.5.1.12.1
+Version: 16.0.5.2.0
 Requires-Python: >=3.10
 Requires-Dist: odoo-addon-date_range>=16.0dev,<16.1dev
 Requires-Dist: odoo-addon-report_xlsx>=16.0dev,<16.1dev
@@ -25,7 +25,7 @@ MIS Builder
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:0905c54fc67af6b27dd21cebeffdfb327bf4c8f2179938b30b4943c499516ad5
+   !! source digest: sha256:2c8b76b489e5323dae1133488deb91d0bcbf86be319044b51399b56b566e3c8b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

{odoo_addon_mis_builder-16.0.5.1.12.1.dist-info → odoo_addon_mis_builder-16.0.5.2.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/mis_builder/README.rst,sha256=cgfo7wi1O1awHvyFo2bghX6eF6xDXUrZSpUkaU1SkcY,29747
+odoo/addons/mis_builder/README.rst,sha256=cex0nZCQC3_G89UAQr0diGkhEKrnekmbHMHyahqu0Ck,29747
 odoo/addons/mis_builder/__init__.py,sha256=-8wG-57WxKfMMA5_TFzpubBcfthcsAP5vjTkhXKf7ds,185
-odoo/addons/mis_builder/__manifest__.py,sha256=wK1kE7ZxsBZ878w2URb3AVWL-KtNZ6iHSuP3Y-DkxQ8,1557
+odoo/addons/mis_builder/__manifest__.py,sha256=nK2bf1OJhoQD7PKtyEeGQBYg_gTaKFIDIc8POvwf--I,1556
 odoo/addons/mis_builder/datas/ir_cron.xml,sha256=H5nnz-4CqZPVveJdRoJ_DrBOOsihK4XwOjWcSMYv68A,558
 odoo/addons/mis_builder/i18n/ca.po,sha256=_hw-pIoOudeREKA5F6I3ZzNFoi5ScbAjt-n8w-K0-TI,89958
 odoo/addons/mis_builder/i18n/de.po,sha256=N_3JJJ-4ofgF3CyPVcRmBu--FS9OlNcauLwrzB1R7Ok,65267
@@ -10,7 +10,7 @@ odoo/addons/mis_builder/i18n/es.po,sha256=Xa_UQEBXkHapuBf8iQeKTD4JyAAGgKzeov7N5O
 odoo/addons/mis_builder/i18n/fr.po,sha256=Na0W0U_mP8bi8tedcvzn8LPglIacwH7GR1K82xrEyUk,82680
 odoo/addons/mis_builder/i18n/hr.po,sha256=t7Z4FbdbdkDXRFKqhVNz2dNnabwv1725hJoG8VMrAvE,67345
 odoo/addons/mis_builder/i18n/it.po,sha256=5DDJtgum-XgFaLX6IFm1omM1JdKUE2PEzZUkUqZVKMo,76184
-odoo/addons/mis_builder/i18n/mis_builder.pot,sha256=-pF8toPMa87vKcacFbgFT6QWneZqXhyhn36wGK8VGO4,62113
+odoo/addons/mis_builder/i18n/mis_builder.pot,sha256=aO4Ce34mTfRmLpCjpYfUWRa7uqXWBNBtLThScqz-R0M,63001
 odoo/addons/mis_builder/i18n/nl.po,sha256=2xbRSRD-PZAQZC54RwlKQUIBFsGdGdfsfbb_EWqg2Nw,74688
 odoo/addons/mis_builder/i18n/nl_NL.po,sha256=d3RKauD0_rcouw1Na_BOAdceBniIXRG414iGfkgTbGo,74780
 odoo/addons/mis_builder/i18n/pt.po,sha256=2wzm81ssyHtsfrZCNcM8PibuY8J8VgfoizvNM74NbX4,64056
@@ -21,8 +21,8 @@ odoo/addons/mis_builder/migrations/16.0.1.0.1/post-migration.py,sha256=kSvTOKc5R
 odoo/addons/mis_builder/migrations/16.0.5.0.0/end-migrate.py,sha256=YquWWej_lW3mhkYTSQPqEC_BucmxtLRgwGWU1My7fo8,326
 odoo/addons/mis_builder/models/__init__.py,sha256=_h9tbt-H0JjtHL6kI7-wiEnd5u2qkP855DevyjxLBbI,331
 odoo/addons/mis_builder/models/accounting_none.py,sha256=6EE6x4slUbyP2TVnHpilsWu8XqWhGZMt79uBOmNLcVs,4156
-odoo/addons/mis_builder/models/aep.py,sha256=hl7pG2SMt3ACSkcTZvHOL7gkNwJ1dAw5nonTadOVKpI,22493
-odoo/addons/mis_builder/models/aggregate.py,sha256=jLULkhMPh4FBJ9T8Al2Qf9uUwBjhS5t8W2J2tRrYQAA,2860
+odoo/addons/mis_builder/models/aep.py,sha256=hPO7mVTfYLKSvexEBWRDE8hWvod6KwzyobSg2k4r69U,26306
+odoo/addons/mis_builder/models/aggregate.py,sha256=ffOZq2-R7st-1Hsw-lFfiwkMa46ToJZ7m0K6Z9P_gwQ,2892
 odoo/addons/mis_builder/models/data_error.py,sha256=ltTIrFCbsxYXmdPTVFVJj3ejZxyc83NEsIFQs2s3-L0,442
 odoo/addons/mis_builder/models/expression_evaluator.py,sha256=honBPA9VOg0q_BOPuB8CkMA_wcoMUMxDbB-ULnjRpb4,2459
 odoo/addons/mis_builder/models/kpimatrix.py,sha256=otTvqqvLOINVL1jbudn2PhvWwURDtmsoNN5TzM0hIwI,19812
@@ -53,7 +53,7 @@ odoo/addons/mis_builder/static/description/ex_report_preview.png,sha256=NKBRn70E
 odoo/addons/mis_builder/static/description/ex_report_settings.png,sha256=T7j_3DUUtdZ6XKsAvJ3uKsK_-GtRl0sRPD68ZOa6ebA,103790
 odoo/addons/mis_builder/static/description/ex_report_template.png,sha256=c8KgzyGD5QiZNCmxaVR4u3h1K0TJN50uXZWoNsieN8A,100278
 odoo/addons/mis_builder/static/description/icon.png,sha256=0OCahdqDvaS_CHV97ZCbajW0_AcBLVVvja_EJA2mC6s,4770
-odoo/addons/mis_builder/static/description/index.html,sha256=r2jPgGJLH6l8NQoio2pL6G5qKSzR720j8IMkbe8L_m0,55964
+odoo/addons/mis_builder/static/description/index.html,sha256=ctFlUJJKjeQ17RuWqBGKJDBwRzAL66wHR0vEWSpPzMc,55964
 odoo/addons/mis_builder/static/src/components/mis_report_widget.css,sha256=ew7iozGAv9ue3KPf_8qA_AhHlNGis7pJu8A7tc6CO4Y,1198
 odoo/addons/mis_builder/static/src/components/mis_report_widget.esm.js,sha256=UzKMeuffo1BT5VmOi0Um9xtplbvdjcrc-_KOkZrTc_A,5528
 odoo/addons/mis_builder/static/src/components/mis_report_widget.xml,sha256=eKbIbOWmsc_qdT_zYuFdqxZIYpf6JEQGTcXE0vcLax4,5679
@@ -62,7 +62,7 @@ odoo/addons/mis_builder/tests/__init__.py,sha256=ilgojed90T4NL_YXgVf3CACd8fo7nxp
 odoo/addons/mis_builder/tests/common.py,sha256=7LqnpPyJ8yOi5gA4CwiKZaep6NGY_vIDnK36u8WVC1o,1918
 odoo/addons/mis_builder/tests/fake_models.py,sha256=DWJsXiIVVXZwXfLQ-9TmUs3eM5KBCXibS2qRXgkFt1c,177
 odoo/addons/mis_builder/tests/test_accounting_none.py,sha256=satnhbRuI4DdWIOpe-mG7sW9KlamgnyvoVaPQlqZ9FA,239
-odoo/addons/mis_builder/tests/test_aep.py,sha256=qvvx1jE-zQRZ8Vm-eDUBTSl_oR4ogM6DqDLelS8gjcI,15870
+odoo/addons/mis_builder/tests/test_aep.py,sha256=o931AKWU-VlPGNMocslyMCng8k7JZ5pkPoJdyykkGQM,17701
 odoo/addons/mis_builder/tests/test_aggregate.py,sha256=ZXEVW0hMZYUIJM6ikQpmBH9Xc9TaY46xYbBsH8vcXDQ,226
 odoo/addons/mis_builder/tests/test_data_sources.py,sha256=ao0FFFxvgvDfGZJzQ_ErTIRc8HM9JD_-8nr8OGeSu_g,7461
 odoo/addons/mis_builder/tests/test_kpi_data.py,sha256=PrgfJIkrw5liJ8InLoXCGXMD-uc7y23J-7R-UYxWIO8,4860
@@ -75,13 +75,13 @@ odoo/addons/mis_builder/tests/test_simple_array.py,sha256=PHzSr_vb4Wn7dfwjaFSAlu
 odoo/addons/mis_builder/tests/test_subreport.py,sha256=I7tQdhjaei15lzhXQLrbL80mlFtAyeoV-gHcs6xaEUo,3202
 odoo/addons/mis_builder/tests/test_target_move.py,sha256=Jw7F9QMHVekOr-hoAy6kKCNcYAZAmfjOUbqcgjPw9Ps,1296
 odoo/addons/mis_builder/tests/test_utc_midnight.py,sha256=mET_qOOC3qsOJ4MK_yTRocicW_NvKdRhjtpVJjLYaaU,917
-odoo/addons/mis_builder/views/mis_report.xml,sha256=pSc0-kg00Y-fR3WtSJd4OlBNG2U2pf6eV_w_ppbFgOA,15537
+odoo/addons/mis_builder/views/mis_report.xml,sha256=9iacm2GDBaINfypwgb3mxQYkz-412g3eku3E3bhrWbY,15906
 odoo/addons/mis_builder/views/mis_report_instance.xml,sha256=dhOu5S7NwT4Yf5xSTOF0gcliwJN77fQTPJhqd4zpSaU,19213
 odoo/addons/mis_builder/views/mis_report_style.xml,sha256=HRsXhEZZYbuZg7qJyfhdnERiTplX7uaN3e0dMunGoD0,4896
 odoo/addons/mis_builder/wizard/__init__.py,sha256=qlc_LcwA6U3Wgv-qC9uacPjZXV3jShrV_RBiuKCBNPA,158
 odoo/addons/mis_builder/wizard/mis_builder_dashboard.py,sha256=DIas3iie9fb2WzJ2eGcrVc7y64IuRyxSG7tJrcV-53g,3404
 odoo/addons/mis_builder/wizard/mis_builder_dashboard.xml,sha256=ArG86hdyRWm531nK0hYU-j1N87yXtpDVpSuKTmOB47I,1440
-odoo_addon_mis_builder-16.0.5.1.12.1.dist-info/METADATA,sha256=7QWU4pCInrqh_O8p-a2xYSFFaszN5fRe1RcHugFq5X8,30464
-odoo_addon_mis_builder-16.0.5.1.12.1.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
-odoo_addon_mis_builder-16.0.5.1.12.1.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_mis_builder-16.0.5.1.12.1.dist-info/RECORD,,
+odoo_addon_mis_builder-16.0.5.2.0.dist-info/METADATA,sha256=HyBplR9zkov3Lk6w8HoikWWzSjvzNKDbjSMs2s8Kk_I,30461
+odoo_addon_mis_builder-16.0.5.2.0.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
+odoo_addon_mis_builder-16.0.5.2.0.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_mis_builder-16.0.5.2.0.dist-info/RECORD,,