From 6fdb58ce23c9813e1ff76f6fe09c88e304bdfaed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 15 May 2016 22:24:27 +0200 Subject: [PATCH] [IMP] mis_builder: remove _ from some method names because they are part of the public API (though not usable over rpc) --- mis_builder/models/mis_report.py | 29 ++++++++++++----------- mis_builder/models/mis_report_instance.py | 6 ++--- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/mis_builder/models/mis_report.py b/mis_builder/models/mis_report.py index e008d3ee..c4f5e4c7 100644 --- a/mis_builder/models/mis_report.py +++ b/mis_builder/models/mis_report.py @@ -768,7 +768,7 @@ class MisReport(models.Model): # TODO: kpi name cannot be start with query name @api.multi - def _prepare_kpi_matrix(self): + def prepare_kpi_matrix(self): self.ensure_one() kpi_matrix = KpiMatrix(self.env) for kpi in self.kpi_ids: @@ -776,7 +776,7 @@ class MisReport(models.Model): return kpi_matrix @api.multi - def _prepare_aep(self, company): + def prepare_aep(self, company): self.ensure_one() aep = AEP(self.env) for kpi in self.kpi_ids: @@ -853,20 +853,21 @@ class MisReport(models.Model): return res @api.multi - def _declare_and_compute_period(self, kpi_matrix, - col_key, - col_description, - col_comment, - aep, - date_from, date_to, - target_move, - company, - subkpis_filter=None, - get_additional_move_line_filter=None, - get_additional_query_filter=None): + def declare_and_compute_period(self, kpi_matrix, + col_key, + col_description, + col_comment, + aep, + date_from, date_to, + target_move, + company, + subkpis_filter=None, + get_additional_move_line_filter=None, + get_additional_query_filter=None): """ Evaluate a report for a given period, populating a KpiMatrix. - :param kpi_matrix: the KpiMatrix object to be populated + :param kpi_matrix: the KpiMatrix object to be populated created + with prepare_kpi_matrix() :param col_key: the period key to use when populating the KpiMatrix :param aep: an AccountingExpressionProcessor instance created using _prepare_aep() diff --git a/mis_builder/models/mis_report_instance.py b/mis_builder/models/mis_report_instance.py index 2e65934c..431f9500 100644 --- a/mis_builder/models/mis_report_instance.py +++ b/mis_builder/models/mis_report_instance.py @@ -353,8 +353,8 @@ class MisReportInstance(models.Model): @api.multi def _compute_matrix(self): self.ensure_one() - aep = self.report_id._prepare_aep(self.company_id) - kpi_matrix = self.report_id._prepare_kpi_matrix() + aep = self.report_id.prepare_aep(self.company_id) + kpi_matrix = self.report_id.prepare_kpi_matrix() for period in self.period_ids: if period.date_from == period.date_to: comment = self._format_date(period.date_from) @@ -362,7 +362,7 @@ class MisReportInstance(models.Model): date_from = self._format_date(period.date_from) date_to = self._format_date(period.date_to) comment = _('from %s to %s') % (date_from, date_to) - self.report_id._declare_and_compute_period( + self.report_id.declare_and_compute_period( kpi_matrix, period.id, period.name,