diff --git a/odex30_base/kpi_scorecard/data/cron.xml b/odex30_base/kpi_scorecard/data/cron.xml index 353b002..c9cf3b8 100644 --- a/odex30_base/kpi_scorecard/data/cron.xml +++ b/odex30_base/kpi_scorecard/data/cron.xml @@ -10,7 +10,6 @@ 8 hours - -1 diff --git a/odex30_base/kpi_scorecard/models/kpi_category.py b/odex30_base/kpi_scorecard/models/kpi_category.py index 18cd591..f7e4866 100644 --- a/odex30_base/kpi_scorecard/models/kpi_category.py +++ b/odex30_base/kpi_scorecard/models/kpi_category.py @@ -175,7 +175,7 @@ class kpi_category(models.Model): "text": self.name, "id": self.id, } - if self._context.get("show_tooltip") and hasattr(self, "description") and self.description not in EMPTYHTML: + if self._context.get("show_tooltip") and hasattr(self, "description") : res.update({"a_attr": {"kn_tip": self.description},}) child_res = [] for child in self.child_ids.sorted(lambda ch: ch.sequence): diff --git a/odex30_base/kpi_scorecard/models/kpi_scorecard_line.py b/odex30_base/kpi_scorecard/models/kpi_scorecard_line.py index ad9701b..d056e25 100644 --- a/odex30_base/kpi_scorecard/models/kpi_scorecard_line.py +++ b/odex30_base/kpi_scorecard/models/kpi_scorecard_line.py @@ -90,7 +90,7 @@ class kpi_scorecard_line(models.Model): ) description = fields.Text( related="kpi_id.description", - store=True, + ) period_id = fields.Many2one( "kpi.period", diff --git a/odex30_base/kpi_scorecard/views/kpi_category.xml b/odex30_base/kpi_scorecard/views/kpi_category.xml index 69ef77f..8ffcd09 100644 --- a/odex30_base/kpi_scorecard/views/kpi_category.xml +++ b/odex30_base/kpi_scorecard/views/kpi_category.xml @@ -79,7 +79,7 @@ - + @@ -92,19 +92,19 @@ kpi.category.tree kpi.category - + - + KPI Categories ir.actions.act_window kpi.category - tree,form + list,form diff --git a/odex30_base/kpi_scorecard/views/kpi_constant.xml b/odex30_base/kpi_scorecard/views/kpi_constant.xml index 41148df..1dcce14 100644 --- a/odex30_base/kpi_scorecard/views/kpi_constant.xml +++ b/odex30_base/kpi_scorecard/views/kpi_constant.xml @@ -41,10 +41,10 @@ - + - + @@ -56,7 +56,7 @@ - + @@ -69,18 +69,18 @@ kpi.constant.tree kpi.constant - + - + Constants ir.actions.act_window kpi.constant - tree,form + list,form

diff --git a/odex30_base/kpi_scorecard/views/kpi_item.xml b/odex30_base/kpi_scorecard/views/kpi_item.xml index aece496..a2e331f 100644 --- a/odex30_base/kpi_scorecard/views/kpi_item.xml +++ b/odex30_base/kpi_scorecard/views/kpi_item.xml @@ -35,7 +35,7 @@

@@ -58,13 +58,13 @@ @@ -124,7 +124,7 @@ />
- + @@ -136,19 +136,19 @@ kpi.item.tree kpi.item - + - + KPI ir.actions.act_window kpi.item - tree,form + list,form

diff --git a/odex30_base/kpi_scorecard/views/kpi_measure.xml b/odex30_base/kpi_scorecard/views/kpi_measure.xml index c959017..8d2a975 100644 --- a/odex30_base/kpi_scorecard/views/kpi_measure.xml +++ b/odex30_base/kpi_scorecard/views/kpi_measure.xml @@ -41,7 +41,7 @@ type="action" class="oe_stat_button" icon="fa-list" - context="{'search_default_measure_id': active_id, 'default_measure_id': active_id}" + context="{'search_default_measure_id': id, 'default_measure_id': id}" > @@ -72,7 +73,7 @@ nolabel="1" style="color:red;" /> - + @@ -81,7 +82,9 @@ ('model', '=', model_name), ('ttype', 'in', ['integer', 'float', 'monetary']), ]" - attrs="{'invisible':['|', ('model_id', '=', False), ('measure_type', '=', 'count')], 'required': [('measure_type', 'in', ['sum', 'average']), ('model_id', '!=', False)]}" + invisible="not model_id or measure_type == 'count'" + required="measure_type in ['sum', 'average'] and model_id" + options="{'no_create_edit': 1, 'no_quick_create': 1}" /> @@ -100,13 +103,13 @@ ('ttype', 'in', ['many2one']), ('relation', '=', 'res.company'), ]" - attrs="{'invisible':[('model_id', '=', False)]}" + invisible="not model_id" options="{'no_create_edit': 1, 'no_quick_create': 1}" /> @@ -119,21 +122,21 @@ - + + readonly="1" + invisible="not model_name" + /> @@ -141,7 +144,7 @@ - + @@ -154,21 +157,21 @@ kpi.measure.tree kpi.measure - + - + Basic Measurements ir.actions.act_window kpi.measure - tree,form + list,form {'search_default_installed_kpis': 1} diff --git a/odex30_base/kpi_scorecard/views/kpi_measure_item.xml b/odex30_base/kpi_scorecard/views/kpi_measure_item.xml index 7ad5348..f825fd0 100644 --- a/odex30_base/kpi_scorecard/views/kpi_measure_item.xml +++ b/odex30_base/kpi_scorecard/views/kpi_measure_item.xml @@ -53,7 +53,8 @@ widget="domain" options="{'model': 'model_name'}" style="min-height:200px !important;" - attrs="{'invisible': ['|', ('model_name', '=', False), ('measure_type', 'not in', ['sum', 'average', 'count'])]}" + invisible="not model_name or measure_type not in ['sum', 'average', 'count']" + /> @@ -68,7 +69,7 @@ - + @@ -81,19 +82,19 @@ kpi.measure.item.tree kpi.measure.item - + - + Measurements (Variables) ir.actions.act_window kpi.measure.item - tree,form + list,form [('existing_kpi', '!=', False)] diff --git a/odex30_base/kpi_scorecard/views/kpi_period.xml b/odex30_base/kpi_scorecard/views/kpi_period.xml index 304de93..48ebaa0 100644 --- a/odex30_base/kpi_scorecard/views/kpi_period.xml +++ b/odex30_base/kpi_scorecard/views/kpi_period.xml @@ -45,7 +45,7 @@ type="object" class="oe_stat_button" icon="fa-stop" - attrs="{'invisible': [('state', 'not in', ['open'])]}" + invisible="state not in ['open']" > Close Period @@ -53,7 +53,7 @@ type="object" class="oe_stat_button" icon="fa-refresh" - attrs="{'invisible': [('state', 'not in', ['closed'])]}" + invisible="state not in ['closed']" > Re-Open Period @@ -61,8 +61,9 @@ type="action" class="oe_stat_button" icon="fa-exchange" - attrs="{'invisible': [('state', 'not in', ['open'])]}" - context="{'default_period_id': active_id}" + invisible="state not in ['open']" + + context="{'default_period_id': id}" > Substitute Targets @@ -80,11 +81,12 @@

to
- + - + @@ -114,7 +117,7 @@ /> - + @@ -127,19 +130,19 @@ kpi.period.tree kpi.period - + - +
Periods ir.actions.act_window kpi.period - tree,form + list,form {'search_default_open_periods': 1} diff --git a/odex30_base/kpi_scorecard/views/kpi_scorecard_line.xml b/odex30_base/kpi_scorecard/views/kpi_scorecard_line.xml index 0547a65..f0db7f0 100644 --- a/odex30_base/kpi_scorecard/views/kpi_scorecard_line.xml +++ b/odex30_base/kpi_scorecard/views/kpi_scorecard_line.xml @@ -36,7 +36,7 @@ invisible="1" /> -
+