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/models/mis_report.py

@@ -11,9 +11,8 @@ from collections import defaultdict
 import dateutil
 import pytz
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError, ValidationError
-from odoo.models import expression as osv_expression
 from odoo.tools.safe_eval import (
     datetime as safe_datetime,
 )
@@ -112,9 +111,9 @@ class MisReportKpi(models.Model):
     )
     type = fields.Selection(
         [
-            (TYPE_NUM, _("Numeric")),
-            (TYPE_PCT, _("Percentage")),
-            (TYPE_STR, _("String")),
+            (TYPE_NUM, "Numeric"),
+            (TYPE_PCT, "Percentage"),
+            (TYPE_STR, "String"),
         ],
         required=True,
         string="Value type",
@@ -122,16 +121,16 @@ class MisReportKpi(models.Model):
     )
     compare_method = fields.Selection(
         [
-            (CMP_DIFF, _("Difference")),
-            (CMP_PCT, _("Percentage")),
-            (CMP_NONE, _("None")),
+            (CMP_DIFF, "Difference"),
+            (CMP_PCT, "Percentage"),
+            (CMP_NONE, "None"),
         ],
         required=True,
         string="Comparison Method",
         default=CMP_PCT,
     )
     accumulation_method = fields.Selection(
-        [(ACC_SUM, _("Sum")), (ACC_AVG, _("Average")), (ACC_NONE, _("None"))],
+        [(ACC_SUM, "Sum"), (ACC_AVG, "Average"), (ACC_NONE, "None")],
         required=True,
         default=ACC_SUM,
         help="Determines how values of this kpi spanning over a "
@@ -159,8 +158,8 @@ class MisReportKpi(models.Model):
         for record in self:
             if not _is_valid_python_var(record.name):
                 raise ValidationError(
-                    _("KPI name ({}) must be a valid python identifier").format(
-                        record.name
+                    self.env._(
+                        "KPI name (%s) must be a valid python identifier", record.name
                     )
                 )
 
@@ -265,8 +264,9 @@ class MisReportSubkpi(models.Model):
         for record in self:
             if not _is_valid_python_var(record.name):
                 raise ValidationError(
-                    _("Sub-KPI name ({}) must be a valid python identifier").format(
-                        record.name
+                    self.env._(
+                        "Sub-KPI name (%s) must be a valid python identifier",
+                        record.name,
                     )
                 )
 
@@ -312,48 +312,35 @@ class MisReportKpiExpression(models.Model):
             kpi = rec.kpi_id
             subkpi = rec.subkpi_id
             if subkpi:
-                name = "{} / {} ({}.{})".format(
-                    kpi.description, subkpi.description, kpi.name, subkpi.name
+                name = (
+                    f"{kpi.description} / {subkpi.description} "
+                    f"({kpi.name}.{subkpi.name})"
                 )
             else:
                 name = rec.kpi_id.display_name
             rec.display_name = name
 
     @api.model
-    def _name_search(self, name, domain=None, operator="ilike", limit=None, order=None):
-        # TODO maybe implement negative search operators, although
-        #      there is not really a use case for that
-        domain = domain or []
-        splitted_name = name.split(".", 2)
-        name_search_domain = []
-        if "." in name:
-            kpi_name, subkpi_name = splitted_name[0], splitted_name[1]
-            name_search_domain = osv_expression.AND(
-                [
-                    name_search_domain,
-                    [
-                        "|",
-                        "|",
-                        "&",
-                        ("kpi_id.name", "=", kpi_name),
-                        ("subkpi_id.name", operator, subkpi_name),
-                        ("kpi_id.description", operator, name),
-                        ("subkpi_id.description", operator, name),
-                    ],
-                ]
-            )
-        name_search_domain = osv_expression.OR(
-            [
-                name_search_domain,
-                [
-                    "|",
-                    ("kpi_id.name", operator, name),
-                    ("kpi_id.description", operator, name),
-                ],
+    def _search_display_name(self, operator, value):
+        if "." in value:
+            kpi_name, subkpi_name = value.split(".", 1)
+            name_search_domain = [
+                "|",
+                "|",
+                "&",
+                ("kpi_id.name", "=", kpi_name),
+                ("subkpi_id.name", operator, subkpi_name),
+                ("kpi_id.description", operator, value),
+                ("subkpi_id.description", operator, value),
             ]
-        )
-        domain = osv_expression.AND([domain, name_search_domain])
-        return self._search(domain, limit=limit, order=order)
+        else:
+            name_search_domain = [
+                "|",
+                ("kpi_id.name", operator, value),
+                ("kpi_id.description", operator, value),
+            ]
+
+        return name_search_domain
 
 
 class MisReportQuery(models.Model):
@@ -382,10 +369,10 @@ class MisReportQuery(models.Model):
     )
     aggregate = fields.Selection(
         [
-            ("sum", _("Sum")),
-            ("avg", _("Average")),
-            ("min", _("Min")),
-            ("max", _("Max")),
+            ("sum", "Sum"),
+            ("avg", "Average"),
+            ("min", "Min"),
+            ("max", "Max"),
         ],
     )
     date_field = fields.Many2one(
@@ -406,8 +393,8 @@ class MisReportQuery(models.Model):
         for record in self:
             if not _is_valid_python_var(record.name):
                 raise ValidationError(
-                    _("Query name ({}) must be valid python identifier").format(
-                        record.name
+                    self.env._(
+                        "Query name (%s) must be valid python identifier", record.name
                     )
                 )
 
@@ -528,7 +515,7 @@ class MisReport(models.Model):
     def copy(self, default=None):
         self.ensure_one()
         default = dict(default or [])
-        default["name"] = _("%s (copy)") % self.name
+        default["name"] = self.env._("%s (copy)", self.name)
         new = super().copy(default)
         # after a copy, we have new subkpis, but the expressions
         # subkpi_id fields still point to the original one, so
@@ -722,7 +709,7 @@ class MisReport(models.Model):
                         vals = vals[0]
                         if len(vals) != col.colspan:
                             raise SubKPITupleLengthError(
-                                _(
+                                self.env._(
                                     'KPI "%(kpi)s" is valued as a tuple of '
                                     "length %(length)s while a tuple of length"
                                     "%(expected_length)s is expected.",
@@ -735,7 +722,7 @@ class MisReport(models.Model):
                         vals = (vals[0],) * col.colspan
                     else:
                         raise SubKPIUnknownTypeError(
-                            _(
+                            self.env._(
                                 'KPI "%(kpi)s" has type %(type)s while a tuple was '
                                 "expected.\n\nThis can be fixed by either:\n\t- "
                                 "Changing the KPI value to a tuple of length "
@@ -940,7 +927,9 @@ class MisReport(models.Model):
             # all (in Odoo 13+, there is also the cancel state that we must ignore)
             return [("parent_state", "in", ("posted", "draft"))]
         else:
-            raise UserError(_("Unexpected value %s for target_move.") % (target_move,))
+            raise UserError(
+                self.env._("Unexpected value %s for target_move.", target_move)
+            )
 
     def evaluate(
         self,

odoo/addons/mis_builder/models/mis_report_instance.py

@@ -8,7 +8,7 @@ import logging
 
 from dateutil.relativedelta import relativedelta
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError, ValidationError
 
 from .aep import AccountingExpressionProcessor as AEP
@@ -58,7 +58,9 @@ class MisReportInstancePeriodSum(models.Model):
         for rec in self:
             if rec.period_id == rec.period_to_sum_id:
                 raise ValidationError(
-                    _("You cannot sum period %s with itself.") % rec.period_id.name
+                    self.env._(
+                        "You cannot sum period %s with itself.", rec.period_id.name
+                    )
                 )
 
 
@@ -187,11 +189,11 @@ class MisReportInstancePeriod(models.Model):
     )
     type = fields.Selection(
         [
-            ("d", _("Day")),
-            ("w", _("Week")),
-            ("m", _("Month")),
-            ("y", _("Year")),
-            ("date_range", _("Date Range")),
+            ("d", "Day"),
+            ("w", "Week"),
+            ("m", "Month"),
+            ("y", "Year"),
+            ("date_range", "Date Range"),
         ],
         string="Period type",
     )
@@ -306,7 +308,7 @@ class MisReportInstancePeriod(models.Model):
             if record.source == SRC_ACTUALS:
                 if not record.report_instance_id.report_id:
                     raise UserError(
-                        _(
+                        self.env._(
                             "Please select a report template and/or "
                             "save the report before adding columns."
                         )
@@ -338,13 +340,13 @@ class MisReportInstancePeriod(models.Model):
                 report_account_model = record.report_id.account_model
                 if record_model != report_account_model:
                     raise ValidationError(
-                        _(
+                        self.env._(
                             "Actual (alternative) models used in columns must "
                             "have the same account model in the Account field and must "
                             "be the same defined in the "
-                            "report template: %s"
+                            "report template: %s",
+                            report_account_model,
                         )
-                        % report_account_model
                     )
 
     @api.onchange("date_range_id")
@@ -414,14 +416,20 @@ class MisReportInstancePeriod(models.Model):
             if rec.source in (SRC_ACTUALS, SRC_ACTUALS_ALT):
                 if rec.mode == MODE_NONE:
                     raise DateFilterRequired(
-                        _("A date filter is mandatory for this source " "in column %s.")
-                        % rec.name
+                        self.env._(
+                            "A date filter is mandatory for this source "
+                            "in column %s.",
+                            rec.name,
+                        )
                     )
             elif rec.source in (SRC_SUMCOL, SRC_CMPCOL):
                 if rec.mode != MODE_NONE:
                     raise DateFilterForbidden(
-                        _("No date filter is allowed for this source " "in column %s.")
-                        % rec.name
+                        self.env._(
+                            "No date filter is allowed for this source "
+                            "in column %s.",
+                            rec.name,
+                        )
                     )
 
     @api.constrains("source", "source_cmpcol_from_id", "source_cmpcol_to_id")
@@ -430,11 +438,13 @@ class MisReportInstancePeriod(models.Model):
             if rec.source == SRC_CMPCOL:
                 if not rec.source_cmpcol_from_id or not rec.source_cmpcol_to_id:
                     raise ValidationError(
-                        _("Please provide both columns to compare in %s.") % rec.name
+                        self.env._(
+                            "Please provide both columns to compare in %s.", rec.name
+                        )
                     )
                 if rec.source_cmpcol_from_id == rec or rec.source_cmpcol_to_id == rec:
                     raise ValidationError(
-                        _("Column %s cannot be compared to itrec.") % rec.name
+                        self.env._("Column %s cannot be compared to itrec.", rec.name)
                     )
                 if (
                     rec.source_cmpcol_from_id.report_instance_id
@@ -443,8 +453,11 @@ class MisReportInstancePeriod(models.Model):
                     != rec.report_instance_id
                 ):
                     raise ValidationError(
-                        _("Columns to compare must belong to the same report " "in %s")
-                        % rec.name
+                        self.env._(
+                            "Columns to compare must belong to the same report "
+                            "in %s",
+                            rec.name,
+                        )
                     )
 
     def copy_data(self, default=None):
@@ -652,7 +665,7 @@ class MisReportInstance(models.Model):
     def copy(self, default=None):
         self.ensure_one()
         default = dict(default or {})
-        default["name"] = _("%s (copy)") % self.name
+        default["name"] = self.env._("%s (copy)", self.name)
         return super().copy(default)
 
     def _format_date(self, date):
@@ -789,8 +802,10 @@ class MisReportInstance(models.Model):
     def _add_column_move_lines(self, aep, kpi_matrix, period, label, description):
         if not period.date_from or not period.date_to:
             raise UserError(
-                _("Column %s with move lines source must have from/to dates.")
-                % (period.name,)
+                self.env._(
+                    "Column %s with move lines source must have from/to dates.",
+                    period.name,
+                )
             )
         expression_evaluator = ExpressionEvaluator(
             aep,
@@ -862,7 +877,7 @@ class MisReportInstance(models.Model):
             elif period.date_from and period.date_to:
                 date_from = self._format_date(period.date_from)
                 date_to = self._format_date(period.date_to)
-                description = _(
+                description = self.env._(
                     "from %(date_from)s to %(date_to)s",
                     date_from=date_from,
                     date_to=date_to,
@@ -879,12 +894,14 @@ class MisReportInstance(models.Model):
 
     @api.model
     def _get_drilldown_views_and_orders(self):
-        return {"tree": 1, "form": 2, "pivot": 3, "graph": 4}
+        return {"list": 1, "form": 2, "pivot": 3, "graph": 4}
 
     @api.model
     def _get_drilldown_model_views(self, model_name):
         self.ensure_one()
-        views_records = self.env["ir.ui.view"].search([("model", "=", model_name)])
+        views_records = (
+            self.env["ir.ui.view"].sudo().search([("model", "=", model_name)])
+        )
         views_records = set(views_records.mapped("type"))
         views_order = self._get_drilldown_views_and_orders()
         views = {view_type for view_type in views_records if view_type in views_order}

odoo/addons/mis_builder/models/mis_report_style.py

@@ -5,7 +5,7 @@
 
 import sys
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 
 from .accounting_none import AccountingNone
@@ -56,7 +56,7 @@ class MisReportKpiStyle(models.Model):
         for record in self:
             if record.indent_level < 0:
                 raise ValidationError(
-                    _("Indent level must be greater than " "or equal to 0")
+                    self.env._("Indent level must be greater than or equal to 0")
                 )
 
     _font_style_selection = [("normal", "Normal"), ("italic", "Italic")]
@@ -84,6 +84,7 @@ class MisReportKpiStyle(models.Model):
     }
 
     # style name
+    # TODO enforce uniqueness
     name = fields.Char(string="Style name", required=True)
 
     # color
@@ -118,11 +119,11 @@ class MisReportKpiStyle(models.Model):
     divider_inherit = fields.Boolean(default=True)
     divider = fields.Selection(
         [
-            ("1e-6", _("µ")),
-            ("1e-3", _("m")),
-            ("1", _("1")),
-            ("1e3", _("k")),
-            ("1e6", _("M")),
+            ("1e-6", "µ"),
+            ("1e-3", "m"),
+            ("1", "1"),
+            ("1e3", "k"),
+            ("1e6", "M"),
         ],
         string="Factor",
         default="1",
@@ -132,10 +133,6 @@ class MisReportKpiStyle(models.Model):
     hide_always_inherit = fields.Boolean(default=True)
     hide_always = fields.Boolean(default=False)
 
-    _sql_constraints = [
-        ("style_name_uniq", "unique(name)", "Style name should be unique")
-    ]
-
     @api.model
     def merge(self, styles):
         """Merge several styles, giving priority to the last.
@@ -239,7 +236,7 @@ class MisReportKpiStyle(models.Model):
         if var_type == TYPE_PCT:
             delta = value - base_value
             if delta and round(delta, (style_props.dp or 0) + 2) != 0:
-                delta_style.update(divider=0.01, prefix="", suffix=_("pp"))
+                delta_style.update(divider=0.01, prefix="", suffix=self.env._("pp"))
             else:
                 delta = AccountingNone
         elif var_type == TYPE_NUM:

odoo/addons/mis_builder/models/mis_report_subreport.py

@@ -1,7 +1,7 @@
 # Copyright 2020 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 
 from .mis_report import _is_valid_python_var
@@ -50,8 +50,9 @@ class MisReportSubReport(models.Model):
         for rec in self:
             if not _is_valid_python_var(rec.name):
                 raise InvalidNameError(
-                    _("Subreport name ({}) must be a valid python identifier").format(
-                        rec.name
+                    self.env._(
+                        "Subreport name (%s) must be a valid python identifier",
+                        rec.name,
                     )
                 )
 
@@ -69,6 +70,6 @@ class MisReportSubReport(models.Model):
 
         for rec in self:
             if _has_subreport(rec.subreport_id, rec.report_id):
-                raise ParentLoopError(_("Subreport loop detected"))
+                raise ParentLoopError(self.env._("Subreport loop detected"))
 
     # TODO check subkpi compatibility in subreports

odoo/addons/mis_builder/models/prorata_read_group_mixin.py

@@ -1,11 +1,15 @@
 # Copyright 2020 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from collections import defaultdict
+from itertools import chain
+
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 from odoo.fields import Date
 
 from .mis_kpi_data import intersect_days
+from .simple_array import SimpleArray
 
 
 class ProRataReadGroupMixin(models.AbstractModel):
@@ -18,8 +22,7 @@ class ProRataReadGroupMixin(models.AbstractModel):
         compute=lambda self: None,
         search="_search_date",
         help=(
-            "Dummy field that adapts searches on date "
-            "to searches on date_from/date_to."
+            "Dummy field that adapts searches on date to searches on date_from/date_to."
         ),
     )
 
@@ -29,7 +32,7 @@ class ProRataReadGroupMixin(models.AbstractModel):
         elif operator in ("<=", "<"):
             return [("date_from", operator, value)]
         raise UserError(
-            _("Unsupported operator %s for searching on date") % (operator,)
+            self.env._("Unsupported operator %s for searching on date", operator)
         )
 
     @api.model
@@ -37,15 +40,36 @@ class ProRataReadGroupMixin(models.AbstractModel):
         return intersect_days(item_dt_from, item_dt_to, dt_from, dt_to)
 
     @api.model
-    def read_group(
-        self, domain, fields, groupby, offset=0, limit=None, orderby=False, lazy=True
+    def _prorata(self, item, dt_from, dt_to, sum_field):
+        if sum_field == "__count":
+            return 1
+        item_dt_from = Date.from_string(item["date_from"])
+        item_dt_to = Date.from_string(item["date_to"])
+        i_days, item_days = self._intersect_days(
+            item_dt_from, item_dt_to, dt_from, dt_to
+        )
+        return item[sum_field] * i_days / item_days
+
+    @api.model
+    def _read_group(
+        self,
+        domain,
+        groupby=(),
+        aggregates=(),
+        having=(),
+        offset=0,
+        limit=None,
+        order=None,
     ):
-        """Override read_group to perform pro-rata temporis adjustments.
+        """Override _read_group to perform pro-rata temporis adjustments.
 
-        When read_group is invoked with a domain that filters on
+        When _read_group is invoked with a domain that filters on
         a time period (date >= from and date <= to, or
         date_from <= to and date_to >= from), adjust the accumulated
         values pro-rata temporis.
+
+        This mechanism works in specific cases and is primarily designed to
+        make AEP work with budget tables.
         """
         date_from = None
         date_to = None
@@ -64,33 +88,29 @@ class ProRataReadGroupMixin(models.AbstractModel):
         if (
             date_from is not None
             and date_to is not None
-            and not any(":" in f for f in fields)
+            and all(a.endswith(":sum") or a == "__count" for a in aggregates)
+            and not any(":" in g for g in groupby)
         ):
             dt_from = Date.from_string(date_from)
             dt_to = Date.from_string(date_to)
-            res = {}
-            sum_fields = set(fields) - set(groupby)
-            read_fields = set(fields + ["date_from", "date_to"])
-            for item in self.search(domain).read(read_fields):
+            stripped_aggregates = [a.rstrip(":sum") for a in aggregates]
+            sum_fields = filter(lambda a: a != "__count", stripped_aggregates)
+            read_fields = [*groupby, *sum_fields, "date_from", "date_to"]
+            # res is a dictionary with a tuple of groupby field names as keys,
+            # and sums of aggregate fields as values.
+            res = defaultdict(lambda: SimpleArray((0.0,) * len(aggregates)))
+            for item in self.search_fetch(domain, read_fields):
                 key = tuple(item[k] for k in groupby)
-                if key not in res:
-                    res[key] = {k: item[k] for k in groupby}
-                    res[key].update({k: 0.0 for k in sum_fields})
-                res_item = res[key]
-                for sum_field in sum_fields:
-                    item_dt_from = Date.from_string(item["date_from"])
-                    item_dt_to = Date.from_string(item["date_to"])
-                    i_days, item_days = self._intersect_days(
-                        item_dt_from, item_dt_to, dt_from, dt_to
-                    )
-                    res_item[sum_field] += item[sum_field] * i_days / item_days
-            return res.values()
-        return super().read_group(
+                res[key] += SimpleArray(
+                    self._prorata(item, dt_from, dt_to, f) for f in stripped_aggregates
+                )
+            return [tuple(chain(k, v)) for k, v in res.items()]
+        return super()._read_group(
             domain,
-            fields,
             groupby,
-            offset=offset,
-            limit=limit,
-            orderby=orderby,
-            lazy=lazy,
+            aggregates,
+            having,
+            offset,
+            limit,
+            order,
         )

odoo/addons/mis_builder/models/simple_array.py

@@ -1,6 +1,6 @@
 # Copyright 2014 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-""" A trivial immutable array that supports basic arithmetic operations.
+"""A trivial immutable array that supports basic arithmetic operations.
 
 >>> a = SimpleArray((1.0, 2.0, 3.0))
 >>> b = SimpleArray((4.0, 5.0, 6.0))
@@ -104,7 +104,7 @@ class SimpleArray(tuple):
 
         if isinstance(other, tuple):
             if len(other) != len(self):
-                raise TypeError("tuples must have same length for %s" % op)
+                raise TypeError(f"tuples must have same length for {op}")
             return self.__class__(map(_o2, self, other))
         else:
             return self.__class__(_o2(z, other) for z in self)

odoo/addons/mis_builder/readme/CONTRIBUTORS.md

@@ -27,3 +27,4 @@
 - Hoang Diep \<<hoang@trobz.com>\>
 - Miquel Pascual  \<<mpascual@apsl.net>\>
 - Antoni Marroig  \<<amarroig@apsl.net>\>
+- Chau Le \<<chaulb@trobz.com>\>

odoo/addons/mis_builder/report/mis_report_instance_xlsx.py

@@ -6,7 +6,7 @@ import numbers
 from collections import defaultdict
 from datetime import datetime
 
-from odoo import _, fields, models
+from odoo import fields, models
 
 from ..models.accounting_none import AccountingNone
 from ..models.data_error import DataError
@@ -161,7 +161,7 @@ class MisBuilderXlsx(models.AbstractModel):
         now_tz = fields.Datetime.context_timestamp(
             self.env["res.users"], datetime.now()
         )
-        create_date = _(
+        create_date = self.env._(
             "Generated on %(gen_date)s at %(gen_time)s",
             gen_date=now_tz.strftime(lang.date_format),
             gen_time=now_tz.strftime(lang.time_format),