diff --git a/project_forecast_line_bokeh_chart/__init__.py b/project_forecast_line_bokeh_chart/__init__.py index 4c4f242fa0..bf588bc8b8 100644 --- a/project_forecast_line_bokeh_chart/__init__.py +++ b/project_forecast_line_bokeh_chart/__init__.py @@ -1 +1,2 @@ +from . import models from . import report diff --git a/project_forecast_line_bokeh_chart/models/__init__.py b/project_forecast_line_bokeh_chart/models/__init__.py new file mode 100644 index 0000000000..d4f5b72ba7 --- /dev/null +++ b/project_forecast_line_bokeh_chart/models/__init__.py @@ -0,0 +1 @@ +from . import forecast_line diff --git a/project_forecast_line_bokeh_chart/models/forecast_line.py b/project_forecast_line_bokeh_chart/models/forecast_line.py new file mode 100644 index 0000000000..7a8bd484d3 --- /dev/null +++ b/project_forecast_line_bokeh_chart/models/forecast_line.py @@ -0,0 +1,43 @@ +# Copyright 2022 Therp BV . +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +from odoo import api, models + + +class ForecastLine(models.Model): + + _inherit = "forecast.line" + + @api.model + def _read_group_raw( + self, domain, fields, groupby, offset=0, limit=None, orderby=False, lazy=True + ): + """ + Inherit and add __range key, like in odoo 15 + https://github.com/odoo/odoo/blob/15.0/odoo/models.py#L2431 + """ + result = super()._read_group_raw( + domain, + fields, + groupby, + offset=offset, + limit=limit, + orderby=orderby, + lazy=lazy, + ) + dt = [ + f + for f in groupby + if self._fields[f.split(":")[0]].type + in ("date", "datetime") # e.g. 'date:month' + ] + for group in result: + if dt: + group["__range"] = {} + for df in dt: + field_name = df.split(":")[0] + if group.get(df): + range_from, range_to = group[df][0].split("/") + group["__range"][field_name] = {"from": range_from, "to": range_to} + else: + group["__range"][field_name] = False + return result diff --git a/project_forecast_line_bokeh_chart/readme/CONTRIBUTORS.rst b/project_forecast_line_bokeh_chart/readme/CONTRIBUTORS.rst index 8785f72c06..b3c64a952a 100644 --- a/project_forecast_line_bokeh_chart/readme/CONTRIBUTORS.rst +++ b/project_forecast_line_bokeh_chart/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Alexandre Fayolle +* Nikos Tsirintanis