From 09bc90889f7e1df51248430d3166683707ba439b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Gil=20Sorribes?= <adria.gil@eficent.com>
Date: Mon, 12 Nov 2018 11:25:13 +0100
Subject: [PATCH] [MIG] kpi to v11

---
 kpi/__init__.py                         |   1 -
 kpi/{__openerp__.py => __manifest__.py} |   3 +-
 kpi/data/kpi.xml                        |  26 ++--
 kpi/models/__init__.py                  |   1 -
 kpi/models/kpi.py                       |   7 +-
 kpi/models/kpi_category.py              |   3 +-
 kpi/models/kpi_history.py               |   3 +-
 kpi/models/kpi_threshold.py             |   3 +-
 kpi/models/kpi_threshold_range.py       |   5 +-
 kpi/tests/__init__.py                   |   1 -
 kpi/tests/test_kpi.py                   |   3 +-
 kpi/views/kpi.xml                       | 169 ++++++++++++------------
 kpi/views/kpi_category.xml              |  76 +++++------
 kpi/views/kpi_history.xml               |  66 +++++----
 kpi/views/kpi_threshold.xml             |  94 +++++++------
 kpi/views/kpi_threshold_range.xml       | 131 +++++++++---------
 kpi/views/menu.xml                      |  72 +++++-----
 17 files changed, 316 insertions(+), 348 deletions(-)
 rename kpi/{__openerp__.py => __manifest__.py} (94%)

diff --git a/kpi/__init__.py b/kpi/__init__.py
index bdb4c9bb..7988aa3f 100644
--- a/kpi/__init__.py
+++ b/kpi/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2012 - Now Savoir-faire Linux <https://www.savoirfairelinux.com/>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/kpi/__openerp__.py b/kpi/__manifest__.py
similarity index 94%
rename from kpi/__openerp__.py
rename to kpi/__manifest__.py
index 82e16d81..d14cc89e 100644
--- a/kpi/__openerp__.py
+++ b/kpi/__manifest__.py
@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
 # Copyright 2012 - Now Savoir-faire Linux <https://www.savoirfairelinux.com/>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     "name": "Key Performance Indicator",
-    "version": "9.0.1.1.0",
+    "version": "11.0.1.1.0",
     "author": "Savoir-faire Linux,Odoo Community Association (OCA)",
     "website": "http://www.savoirfairelinux.com",
     "license": "AGPL-3",
diff --git a/kpi/data/kpi.xml b/kpi/data/kpi.xml
index f32a7986..8bf99d95 100644
--- a/kpi/data/kpi.xml
+++ b/kpi/data/kpi.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2012 - Now Savoir-faire Linux <https://www.savoirfairelinux.com/>
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-<odoo>
-    <data noupdate="1">
-        <record forcecreate="True" id="ir_cron_kpi_action" model="ir.cron">
-            <field name="name">Update KPI values</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="interval_number">1</field>
-            <field name="interval_type">hours</field>
-            <field name="numbercall">-1</field>
-            <field eval="False" name="doall"/>
-            <field eval="'kpi'" name="model"/>
-            <field eval="'update_kpi_value'" name="function"/>
-            <field eval="'()'" name="args"/>
-        </record>
-    </data>
+<odoo noupdate="1">
+    <record forcecreate="True" id="ir_cron_kpi_action" model="ir.cron">
+        <field name="name">Update KPI values</field>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="interval_number">1</field>
+        <field name="interval_type">hours</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+        <field name="model_id" ref="model_kpi"/>
+        <field name="state">code</field>
+        <field name="code">model.update_kpi_value()</field>
+    </record>
 </odoo>
diff --git a/kpi/models/__init__.py b/kpi/models/__init__.py
index f46e81d9..7da5b448 100644
--- a/kpi/models/__init__.py
+++ b/kpi/models/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2012 - Now Savoir-faire Linux <https://www.savoirfairelinux.com/>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/kpi/models/kpi.py b/kpi/models/kpi.py
index f4c1a9af..69c4cabb 100644
--- a/kpi/models/kpi.py
+++ b/kpi/models/kpi.py
@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
 # Copyright 2012 - Now Savoir-faire Linux <https://www.savoirfairelinux.com/>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from datetime import datetime, timedelta
-from openerp import fields, models, api
-from openerp.tools.safe_eval import safe_eval
-from openerp.tools import (
+from odoo import fields, models, api
+from odoo.tools.safe_eval import safe_eval
+from odoo.tools import (
     DEFAULT_SERVER_DATETIME_FORMAT as DATETIME_FORMAT,
 )
 import re
diff --git a/kpi/models/kpi_category.py b/kpi/models/kpi_category.py
index 2c34c9c6..3c97e3aa 100644
--- a/kpi/models/kpi_category.py
+++ b/kpi/models/kpi_category.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # Copyright 2012 - Now Savoir-faire Linux <https://www.savoirfairelinux.com/>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import fields, models
+from odoo import fields, models
 
 
 class KPICategory(models.Model):
diff --git a/kpi/models/kpi_history.py b/kpi/models/kpi_history.py
index 59843156..10fe4f6d 100644
--- a/kpi/models/kpi_history.py
+++ b/kpi/models/kpi_history.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # Copyright 2012 - Now Savoir-faire Linux <https://www.savoirfairelinux.com/>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import fields, models
+from odoo import fields, models
 
 
 class KPIHistory(models.Model):
diff --git a/kpi/models/kpi_threshold.py b/kpi/models/kpi_threshold.py
index b62a3ffb..dcc6199c 100644
--- a/kpi/models/kpi_threshold.py
+++ b/kpi/models/kpi_threshold.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # Copyright 2012 - Now Savoir-faire Linux <https://www.savoirfairelinux.com/>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import fields, models, api, exceptions, _
+from odoo import fields, models, api, exceptions, _
 
 
 class KPIThreshold(models.Model):
diff --git a/kpi/models/kpi_threshold_range.py b/kpi/models/kpi_threshold_range.py
index a5b32313..d1b2d6b3 100644
--- a/kpi/models/kpi_threshold_range.py
+++ b/kpi/models/kpi_threshold_range.py
@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 # Copyright 2012 - Now Savoir-faire Linux <https://www.savoirfairelinux.com/>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import fields, models, api
-from openerp.tools.safe_eval import safe_eval
+from odoo import fields, models, api
+from odoo.tools.safe_eval import safe_eval
 import re
 
 
diff --git a/kpi/tests/__init__.py b/kpi/tests/__init__.py
index c9e401ab..b4dd9f28 100644
--- a/kpi/tests/__init__.py
+++ b/kpi/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import test_kpi
diff --git a/kpi/tests/test_kpi.py b/kpi/tests/test_kpi.py
index 4ac3c0b1..c01ca423 100644
--- a/kpi/tests/test_kpi.py
+++ b/kpi/tests/test_kpi.py
@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp.tests.common import TransactionCase
+from odoo.tests.common import TransactionCase
 
 
 class TestKPI(TransactionCase):
diff --git a/kpi/views/kpi.xml b/kpi/views/kpi.xml
index 73cff3ce..9e5f5394 100644
--- a/kpi/views/kpi.xml
+++ b/kpi/views/kpi.xml
@@ -2,98 +2,97 @@
 <!-- Copyright 2012 - Now Savoir-faire Linux <https://www.savoirfairelinux.com/>
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-    <data>
-        <!-- KPI -->
-        <record id="view_kpi_tree" model="ir.ui.view">
-            <field name="name">kpi.tree</field>
-            <field name="model">kpi</field>
-            <field name="arch" type="xml">
-                <tree string="Key Performance Indicators">
+    <!-- KPI -->
+    <record id="view_kpi_tree" model="ir.ui.view">
+        <field name="name">kpi.tree</field>
+        <field name="model">kpi</field>
+        <field name="arch" type="xml">
+            <tree string="Key Performance Indicators">
+                <field name="name"/>
+                <field name="value" widget="progressbar"/>
+                <field name="category_id"/>
+                <field name="kpi_type"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_kpi_filter" model="ir.ui.view">
+        <field name="name">kpi.filter</field>
+        <field name="model">kpi</field>
+        <field name="arch" type="xml">
+            <search string="KPI">
+                <group>
+                    <filter name="active"
+                            icon="terp-document-new"
+                            domain="[('active','=',True)]"
+                            string="Active"
+                            help="Only active KPIs are computed by the scheduler based on the periodicity configuration."/>
+                    <separator orientation="vertical"/>
                     <field name="name"/>
-                    <field name="value" widget="progressbar"/>
                     <field name="category_id"/>
-                    <field name="kpi_type"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                </tree>
-            </field>
-        </record>
+                    <field name="company_id" group="base.group_multi_company"/>
+                </group>
+                <newline/>
+                <group expand="0" name="Group By...">
+                    <filter string="Category" context="{'group_by':'category_id'}"/>
+                    <filter string="Type" context="{'group_by':'kpi_type'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
-        <record id="view_kpi_filter" model="ir.ui.view">
-            <field name="name">kpi.filter</field>
-            <field name="model">kpi</field>
-            <field name="arch" type="xml">
-                <search string="KPI">
+    <record id="view_kpi_form" model="ir.ui.view">
+        <field name="name">kpi.form</field>
+        <field name="model">kpi</field>
+        <field name="arch" type="xml">
+            <form string="Key Performance Indicator">
+                <sheet>
                     <group>
-                        <filter name="active"
-                                icon="terp-document-new"
-                                domain="[('active','=',True)]"
-                                string="Active"
-                                help="Only active KPIs are computed by the scheduler based on the periodicity configuration."/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="category_id"/>
-                        <field name="company_id" group="base.group_multi_company"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Category" context="{'group_by':'category_id'}"/>
-                        <filter string="Type" context="{'group_by':'kpi_type'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="view_kpi_form" model="ir.ui.view">
-            <field name="name">kpi.form</field>
-            <field name="model">kpi</field>
-            <field name="arch" type="xml">
-                <form string="Key Performance Indicator">
-                    <sheet>
-                        <group col="6" colspan="6">
-                            <field name="name" colspan="2"/>
-                            <field name="threshold_id" colspan="2"/>
-                            <field name="category_id" colspan="2"/>
-                            <newline/>
+                        <group>
+                            <field name="name" />
+                            <field name="threshold_id" />
+                            <field name="category_id" />
+                        </group>
+                        <group>
                             <field name="value" colspan="2"/>
-                            <button name="compute_kpi_value" string="Compute KPI Now" colspan="2" type="object"/>
                             <field name="active" colspan="2"/>
                             <field name="company_id" groups="base.group_multi_company"/>
+                            <button name="compute_kpi_value" string="Compute KPI Now" colspan="2" type="object"/>
                         </group>
-                        <notebook colspan="6">
-                            <page string="History">
-                                <field name="history_ids" readonly="1" nolabel="1"/>
-                            </page>
-                            <page string="Computation">
-                                <group col="6">
-                                    <field name="periodicity" colspan="2"/>
-                                    <field name="periodicity_uom" colspan="2"/>
-                                    <field name="next_execution_date" colspan="2"/>
-                                    <separator string="KPI Computation" colspan="6"/>
-                                    <newline/>
-                                    <field name="kpi_type" colspan="2"/>
-                                    <field name="dbsource_id" colspan="2" attrs="{'invisible' : [('kpi_type', '!=', 'external')]}"/>
-                                    <newline/>
-                                    <field name="kpi_code" colspan="6"/>
-                                </group>
-                            </page>
-                            <page string="Description">
-                                <field name="description" nolabel="1"/>
-                            </page>
-                        </notebook>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="open_kpi_list">
-            <field name="name">Key Performance Indicators</field>
-            <field name="res_model">kpi</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_kpi_tree"/>
-            <field name="search_view_id" ref="view_kpi_filter"/>
-        </record>
-
+                    </group>
+                    <notebook colspan="6">
+                        <page string="History">
+                            <field name="history_ids" readonly="1" nolabel="1"/>
+                        </page>
+                        <page string="Computation">
+                            <group col="6">
+                                <field name="periodicity" colspan="3"/>
+                                <field name="periodicity_uom" colspan="3"/>
+                                <field name="next_execution_date" colspan="3"/>
+                                <separator string="KPI Computation" colspan="6"/>
+                                <newline/>
+                                <field name="kpi_type" colspan="2"/>
+                                <field name="dbsource_id" colspan="2" attrs="{'invisible' : [('kpi_type', '!=', 'external')]}"/>
+                                <newline/>
+                                <field name="kpi_code" colspan="6"/>
+                            </group>
+                        </page>
+                        <page string="Description">
+                            <field name="description" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
 
-    </data>
+    <record model="ir.actions.act_window" id="open_kpi_list">
+        <field name="name">Key Performance Indicators</field>
+        <field name="res_model">kpi</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_kpi_tree"/>
+        <field name="search_view_id" ref="view_kpi_filter"/>
+    </record>
 </odoo>
diff --git a/kpi/views/kpi_category.xml b/kpi/views/kpi_category.xml
index 80c8ac15..bfd3b976 100644
--- a/kpi/views/kpi_category.xml
+++ b/kpi/views/kpi_category.xml
@@ -3,45 +3,39 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 
 <odoo>
-    <data>
-
-
-            <!-- Categories -->
-
-        <record id="view_kpi_category_tree" model="ir.ui.view">
-            <field name="name">kpi.category.tree</field>
-            <field name="model">kpi.category</field>
-            <field name="arch" type="xml">
-                <tree string="Categories">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_kpi_category_form" model="ir.ui.view">
-            <field name="name">kpi.category.form</field>
-            <field name="model">kpi.category</field>
-            <field name="arch" type="xml">
-                <form string="Category">
-                    <sheet>
-                        <group col="2" colspan="2">
-                            <field name="name" colspan="2"/>
-                            <newline/>
-                            <field name="description" colspan="2"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="open_category_list">
-            <field name="name">Categories</field>
-            <field name="res_model">kpi.category</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_kpi_category_tree"/>
-        </record>
-
-
-    </data>
+   <!-- Categories -->
+
+    <record id="view_kpi_category_tree" model="ir.ui.view">
+        <field name="name">kpi.category.tree</field>
+        <field name="model">kpi.category</field>
+        <field name="arch" type="xml">
+            <tree string="Categories">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_kpi_category_form" model="ir.ui.view">
+        <field name="name">kpi.category.form</field>
+        <field name="model">kpi.category</field>
+        <field name="arch" type="xml">
+            <form string="Category">
+                <sheet>
+                    <group col="2" colspan="2">
+                        <field name="name" colspan="2"/>
+                        <newline/>
+                        <field name="description" colspan="2"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="open_category_list">
+        <field name="name">Categories</field>
+        <field name="res_model">kpi.category</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_kpi_category_tree"/>
+    </record>
 </odoo>
diff --git a/kpi/views/kpi_history.xml b/kpi/views/kpi_history.xml
index b6d0cc17..b302aded 100644
--- a/kpi/views/kpi_history.xml
+++ b/kpi/views/kpi_history.xml
@@ -3,38 +3,36 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 
 <odoo>
-    <data>
-        <!-- KPI history -->
-        <record id="view_kpi_history_tree" model="ir.ui.view">
-            <field name="name">kpi.history.tree</field>
-            <field name="model">kpi.history</field>
-            <field name="arch" type="xml">
-                <tree string="KPI History">
-                    <field name="name"/>
-                    <field name="date"/>
-                    <field name="value"/>
-                    <field name="color" widget="color"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_kpi_history_form" model="ir.ui.view">
-            <field name="name">kpi.history.form</field>
-            <field name="model">kpi.history</field>
-            <field name="arch" type="xml">
-                <form string="KPI History">
-                    <sheet>
-                        <group col="4" colspan="4">
-                            <field name="kpi_id"/>
-                            <field name="name"/>
-                            <field name="date"/>
-                            <field name="value"/>
-                            <field name="color" widget="color"/>
-                            <field name="company_id" groups="base.group_multi_company"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-    </data>
+    <!-- KPI history -->
+    <record id="view_kpi_history_tree" model="ir.ui.view">
+        <field name="name">kpi.history.tree</field>
+        <field name="model">kpi.history</field>
+        <field name="arch" type="xml">
+            <tree string="KPI History">
+                <field name="name"/>
+                <field name="date"/>
+                <field name="value"/>
+                <field name="color" widget="color"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+            </tree>
+        </field>
+    </record>
+    <record id="view_kpi_history_form" model="ir.ui.view">
+        <field name="name">kpi.history.form</field>
+        <field name="model">kpi.history</field>
+        <field name="arch" type="xml">
+            <form string="KPI History">
+                <sheet>
+                    <group col="4" colspan="4">
+                        <field name="kpi_id"/>
+                        <field name="name"/>
+                        <field name="date"/>
+                        <field name="value"/>
+                        <field name="color" widget="color"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
 </odoo>
diff --git a/kpi/views/kpi_threshold.xml b/kpi/views/kpi_threshold.xml
index 4bb2d045..e1808404 100644
--- a/kpi/views/kpi_threshold.xml
+++ b/kpi/views/kpi_threshold.xml
@@ -3,55 +3,51 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 
 <odoo>
-    <data>
-        <!-- Thresholds -->
-        <record id="view_kpi_threshold_tree" model="ir.ui.view">
-            <field name="name">kpi.threshold.tree</field>
-            <field name="model">kpi.threshold</field>
-            <field name="arch" type="xml">
-                <tree string="Thresholds" decoration-danger="invalid_message">
-                    <field name="name"/>
-                    <field name="invalid_message"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                </tree>
-            </field>
-        </record>
+    <!-- Thresholds -->
+    <record id="view_kpi_threshold_tree" model="ir.ui.view">
+        <field name="name">kpi.threshold.tree</field>
+        <field name="model">kpi.threshold</field>
+        <field name="arch" type="xml">
+            <tree string="Thresholds" decoration-danger="invalid_message">
+                <field name="name"/>
+                <field name="invalid_message"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+            </tree>
+        </field>
+    </record>
 
-        <record id="view_kpi_threshold_form" model="ir.ui.view">
-            <field name="name">kpi.threshold.form</field>
-            <field name="model">kpi.threshold</field>
-            <field name="arch" type="xml">
-                <form string="Threshold">
-                    <sheet>
-                        <group col="6" colspan="6">
-                            <field name="name" colspan="2"/>
-                            <field name="company_id" groups="base.group_multi_company" colspan="2"/>
-                            <newline/>
-                            <separator string="Ranges" colspan="6"/>
-                            <newline/>
-                            <field name="range_ids" nolabel="1" colspan="6"/>
-                            <newline/>
-                            <separator string="KPIs" colspan="6"/>
-                            <newline/>
-                            <field name="kpi_ids" nolabel="1" colspan="6"/>
-                            <newline/>
-                            <separator string="Errors" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
-                            <field name="invalid_message" nolabel="1" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
-                            <newline/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
+    <record id="view_kpi_threshold_form" model="ir.ui.view">
+        <field name="name">kpi.threshold.form</field>
+        <field name="model">kpi.threshold</field>
+        <field name="arch" type="xml">
+            <form string="Threshold">
+                <sheet>
+                    <group col="6" colspan="6">
+                        <field name="name" colspan="2"/>
+                        <field name="company_id" groups="base.group_multi_company" colspan="2"/>
+                        <newline/>
+                        <separator string="Ranges" colspan="6"/>
+                        <newline/>
+                        <field name="range_ids" nolabel="1" colspan="6"/>
+                        <newline/>
+                        <separator string="KPIs" colspan="6"/>
+                        <newline/>
+                        <field name="kpi_ids" nolabel="1" colspan="6"/>
+                        <newline/>
+                        <separator string="Errors" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
+                        <field name="invalid_message" nolabel="1" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
+                        <newline/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
 
-        <record model="ir.actions.act_window" id="open_threshold_list">
-            <field name="name">Thresholds</field>
-            <field name="res_model">kpi.threshold</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_kpi_threshold_tree"/>
-        </record>
-
-
-    </data>
+    <record model="ir.actions.act_window" id="open_threshold_list">
+        <field name="name">Thresholds</field>
+        <field name="res_model">kpi.threshold</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_kpi_threshold_tree"/>
+    </record>
 </odoo>
diff --git a/kpi/views/kpi_threshold_range.xml b/kpi/views/kpi_threshold_range.xml
index 9ca25e46..b230c7e7 100644
--- a/kpi/views/kpi_threshold_range.xml
+++ b/kpi/views/kpi_threshold_range.xml
@@ -3,74 +3,69 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 
 <odoo>
-    <data>
-        <!-- Ranges -->
-        <record id="view_kpi_threshold_range_tree" model="ir.ui.view">
-            <field name="name">kpi.threshold.range.tree</field>
-            <field name="model">kpi.threshold.range</field>
-            <field name="arch" type="xml">
-                <tree string="Ranges" decoration-danger="invalid_message">
-                    <field name="name"/>
-                    <field name="min_value"/>
-                    <field name="max_value"/>
-                    <field name="color" widget="color"/>
-                    <field name="invalid_message"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                </tree>
-            </field>
-        </record>
+    <!-- Ranges -->
+    <record id="view_kpi_threshold_range_tree" model="ir.ui.view">
+        <field name="name">kpi.threshold.range.tree</field>
+        <field name="model">kpi.threshold.range</field>
+        <field name="arch" type="xml">
+            <tree string="Ranges" decoration-danger="invalid_message">
+                <field name="name"/>
+                <field name="min_value"/>
+                <field name="max_value"/>
+                <field name="color" widget="color"/>
+                <field name="invalid_message"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+            </tree>
+        </field>
+    </record>
 
-        <record id="view_kpi_threshold_range_form" model="ir.ui.view">
-            <field name="name">kpi.threshold.range.form</field>
-            <field name="model">kpi.threshold.range</field>
-            <field name="arch" type="xml">
-                <form string="Range">
-                    <sheet>
-                        <group col="6" colspan="6">
-                            <field name="name"/>
-                            <field name="color"/>
-                            <field name="company_id" groups="base.group_multi_company"/>
-                            <newline/>
+    <record id="view_kpi_threshold_range_form" model="ir.ui.view">
+        <field name="name">kpi.threshold.range.form</field>
+        <field name="model">kpi.threshold.range</field>
+        <field name="arch" type="xml">
+            <form string="Range">
+                <sheet>
+                    <group col="6" colspan="6">
+                        <field name="name" colspan="2"/>
+                        <field name="color" colspan="2"/>
+                        <field name="company_id" groups="base.group_multi_company" colspan="2" />
+                    </group>
+                    <group col="6">
+                        <separator string="Minimum"/>
+                        <newline/>
+                        <field name="min_type" colspan="3"/>
+                        <field name="min_fixed_value" colspan="3" attrs="{'invisible' : [('min_type', '!=', 'static')]}"/>
+                        <field name="min_dbsource_id" colspan="3" attrs="{'invisible' : [('min_type', '!=', 'external')]}"/>
+                        <field name="min_code" colspan="6" attrs="{'invisible' : [('min_type', 'not in', ('local','external','python'))]}"/>
+                        <field name="min_error" colspan="6" attrs="{'invisible': [('min_error', '=', False)]}" />
+                        <newline/>
+                        <separator string="Maximum"/>
+                        <newline/>
+                        <field name="max_type" colspan="3"/>
+                        <field name="max_fixed_value" colspan="3" attrs="{'invisible' : [('max_type', '!=', 'static')]}"/>
+                        <field name="max_dbsource_id" colspan="3" attrs="{'invisible' : [('max_type', '!=', 'external')]}"/>
+                        <newline/>
+                        <field name="max_code" colspan="6" attrs="{'invisible' : [('max_type', 'not in', ('local','external','python'))]}"/>
+                        <newline/>
+                        <field name="max_error" colspan="6" attrs="{'invisible': [('max_error', '=', False)]}" />
+                        <newline/>
+                    </group>
+                    <group col="6" colspan="6">
+                        <separator string="Thresholds" colspan="4"/>
+                        <field name="threshold_ids" nolabel="1" colspan="4"/>
+                        <separator string="Errors" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
+                        <field name="invalid_message" nolabel="1" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
 
-                            <separator string="Minimum" colspan="4"/>
-                            <newline/>
-                            <field name="min_type" colspan="2"/>
-                            <field name="min_fixed_value" colspan="2" attrs="{'invisible' : [('min_type', '!=', 'static')]}"/>
-                            <field name="min_dbsource_id" colspan="2" attrs="{'invisible' : [('min_type', '!=', 'external')]}"/>
-                            <newline/>
-                            <field name="min_code" colspan="6" attrs="{'invisible' : [('min_type', 'NOT IN', ('local','external','python'))]}"/>
-                            <newline/>
-                            <field name="min_error" colspan="6" attrs="{'invisible': [('min_error', '=', False)]}" />
-                            <newline/>
-                            <separator string="Maximum" colspan="4"/>
-                            <newline/>
-                            <field name="max_type"/>
-                            <field name="max_fixed_value" attrs="{'invisible' : [('max_type', '!=', 'static')]}"/>
-                            <field name="max_dbsource_id" attrs="{'invisible' : [('max_type', '!=', 'external')]}"/>
-                            <newline/>
-                            <field name="max_code" colspan="6" attrs="{'invisible' : [('max_type', 'NOT IN', ('local','external','python'))]}"/>
-                            <newline/>
-                            <field name="max_error" colspan="6" attrs="{'invisible': [('max_error', '=', False)]}" />
-                            <newline/>
-                            <separator string="Thresholds" colspan="4"/>
-                            <field name="threshold_ids" nolabel="1" colspan="4"/>
-                            <separator string="Errors" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
-                            <field name="invalid_message" nolabel="1" attrs="{'invisible' : [('invalid_message', '=', False)]}" colspan="4"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="open_threshold_range_list">
-            <field name="name">Ranges</field>
-            <field name="res_model">kpi.threshold.range</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_kpi_threshold_range_tree"/>
-        </record>
-
-
-
-    </data>
+    <record model="ir.actions.act_window" id="open_threshold_range_list">
+        <field name="name">Ranges</field>
+        <field name="res_model">kpi.threshold.range</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_kpi_threshold_range_tree"/>
+    </record>
 </odoo>
diff --git a/kpi/views/menu.xml b/kpi/views/menu.xml
index 506c926d..79176a93 100644
--- a/kpi/views/menu.xml
+++ b/kpi/views/menu.xml
@@ -3,46 +3,44 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 
 <odoo>
-    <data>
-            <menuitem id="menu_reporting_kpi"
-                      name="KPI"
-                      action="open_kpi_list"
-                      sequence="15"
-                      parent="base.menu_reporting_dashboard"
-                      groups="base.group_user"/>
+        <menuitem id="menu_reporting_kpi"
+                  name="KPI"
+                  action="open_kpi_list"
+                  sequence="15"
+                  parent="base.menu_reporting_dashboard"
+                  groups="base.group_user"/>
 
-            <menuitem id="menu_configuration_kpi"
-                      name="KPI"
-                      parent="base.menu_reporting_config"
-                      groups="base.group_user"
-                      sequence="20"/>
+        <menuitem id="menu_configuration_kpi"
+                  name="KPI"
+                  parent="base.menu_reporting_config"
+                  groups="base.group_user"
+                  sequence="20"/>
 
-            <menuitem id="menu_configuration_kpi_category"
-                      name="Categories"
-                      action="open_category_list"
-                      parent="menu_configuration_kpi"
-                      groups="base.group_user"
-                      sequence="10"/>
+        <menuitem id="menu_configuration_kpi_category"
+                  name="Categories"
+                  action="open_category_list"
+                  parent="menu_configuration_kpi"
+                  groups="base.group_user"
+                  sequence="10"/>
 
-            <menuitem id="menu_configuration_kpi_range"
-                      name="Ranges"
-                      action="open_threshold_range_list"
-                      parent="menu_configuration_kpi"
-                      groups="base.group_user"
-                      sequence="20"/>
+        <menuitem id="menu_configuration_kpi_range"
+                  name="Ranges"
+                  action="open_threshold_range_list"
+                  parent="menu_configuration_kpi"
+                  groups="base.group_user"
+                  sequence="20"/>
 
-            <menuitem id="menu_configuration_kpi_dbsource"
-                      name="Data Sources"
-                      action="base_external_dbsource.action_dbsource"
-                      parent="menu_configuration_kpi"
-                      groups="base.group_user"
-                      sequence="20"/>
+        <menuitem id="menu_configuration_kpi_dbsource"
+                  name="Data Sources"
+                  action="base_external_dbsource.action_dbsource"
+                  parent="menu_configuration_kpi"
+                  groups="base.group_user"
+                  sequence="20"/>
 
-            <menuitem id="menu_configuration_kpi_threshold"
-                      name="Thresholds"
-                      action="open_threshold_list"
-                      parent="menu_configuration_kpi"
-                      groups="base.group_user"
-                      sequence="10"/>
-      </data>
+        <menuitem id="menu_configuration_kpi_threshold"
+                  name="Thresholds"
+                  action="open_threshold_list"
+                  parent="menu_configuration_kpi"
+                  groups="base.group_user"
+                  sequence="10"/>
  </odoo>