[MIG] database_cleanup: Migration to version 10.0

Using new base model inheritance.
8 years ago · bf40673c9a
45 changed files with 585 additions and 615 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -23,8 +23,10 @@ env:
  matrix:
  - LINT_CHECK="1"
  - TRANSIFEX="1"
-  - TESTS="1" ODOO_REPO="odoo/odoo"
-  - TESTS="1" ODOO_REPO="OCA/OCB"
+  - TESTS="1" ODOO_REPO="odoo/odoo" EXCLUDE="database_cleanup"
+  - TESTS="1" ODOO_REPO="OCA/OCB" EXCLUDE="database_cleanup"
+  - TESTS="1" ODOO_REPO="odoo/odoo" INCLUDE="database_cleanup"
+  - TESTS="1" ODOO_REPO="OCA/OCB" INCLUDE="database_cleanup"

 virtualenv:
  system_site_packages: true
--- a/database_cleanup/README.rst
+++ b/database_cleanup/README.rst
@ -6,13 +6,13 @@
 Database cleanup
 ================

-Clean your OpenERP database from remnants of modules, models, columns and
+Clean your Odoo database from remnants of modules, models, columns and
 tables left by uninstalled modules (prior to 7.0) or a homebrew database
-upgrade to a new major version of OpenERP.
+upgrade to a new major version of Odoo.

 Caution! This module is potentially harmful and can *easily* destroy the
 integrity of your data. Do not use if you are not entirely comfortable
-with the technical details of the OpenERP data model of *all* the modules
+with the technical details of the Odoo data model of *all* the modules
 that have ever been installed on your database, and do not purge any module,
 model, column or table if you do not know exactly what you are doing.

@ -28,7 +28,7 @@ in one big step (if you are *really* confident).

 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-    :target: https://runbot.odoo-community.org/runbot/149/9.0
+    :target: https://runbot.odoo-community.org/runbot/149/10.0

 Bug Tracker
 ===========
--- a/database_cleanup/manifest.py
+++ b/database_cleanup/manifest.py
@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
    'name': 'Database cleanup',
-    'version': '9.0.1.0.0',
+    'version': '10.0.1.0.0',
    'author': "Therp BV,Odoo Community Association (OCA)",
    'depends': ['base'],
    'license': 'AGPL-3',
@ -20,5 +20,5 @@
        'views/purge_properties.xml',
        'views/menu.xml',
    ],
-    'installable': False,
+    'installable': True,
 }
--- a/database_cleanup/i18n/am.po
+++ b/database_cleanup/i18n/am.po
@ -6,7 +6,7 @@
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/ca.po
+++ b/database_cleanup/i18n/ca.po
@ -1,4 +1,3 @@
-# Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * database_cleanup
 # 
@ -7,7 +6,7 @@
 # Marc Tormo i Bochaca <mtbochaca@gmail.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0c\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
@ -22,7 +21,7 @@ msgstr ""
 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column_purge_line_ids
 msgid "Columns to purge"
-msgstr ""
+msgstr "Columnes a purgar"

 #. module: database_cleanup
 #: model:ir.actions.server,name:database_cleanup.cleanup_create_indexes_line_action
@ -99,17 +98,17 @@ msgstr "Creat el"
 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data_data_id
 msgid "Data entry"
-msgstr ""
+msgstr "Entrada de dades"

 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data_purge_line_ids
 msgid "Data to purge"
-msgstr ""
+msgstr "Dades a purgar"

 #. module: database_cleanup
 #: model:ir.ui.menu,name:database_cleanup.menu_database_cleanup
 msgid "Database cleanup"
-msgstr ""
+msgstr "Neteja de la base de dades"

 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_display_name
@ -131,12 +130,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property_display_name
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table_display_name
 msgid "Display Name"
-msgstr "Veure el nom"
-
-#. module: database_cleanup
-#: selection:cleanup.purge.line.property,reason:0
-msgid "Duplicated property"
-msgstr ""
+msgstr "Nom a mostrar"

 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_field_id
@ -235,17 +229,17 @@ msgstr "Darrera Actualització el"
 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu_menu_id
 msgid "Menu entry"
-msgstr ""
+msgstr "Entrada de menú"

 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu_purge_line_ids
 msgid "Menus to purge"
-msgstr ""
+msgstr "Menús a purgar"

 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_model_id
 msgid "Model"
-msgstr ""
+msgstr "Model"

 #. module: database_cleanup
 #: model:ir.model,name:database_cleanup.model_ir_model
@ -255,12 +249,12 @@ msgstr "Models "
 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model_purge_line_ids
 msgid "Models to purge"
-msgstr ""
+msgstr "Models a purgar"

 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module_purge_line_ids
 msgid "Modules to purge"
-msgstr ""
+msgstr "Mòduls a purgar"

 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_name
@ -279,37 +273,37 @@ msgstr "Nom"
 #: code:addons/database_cleanup/models/purge_menus.py:46
 #, python-format
 msgid "No dangling menu entries found"
-msgstr ""
+msgstr "No s'han trobat entrades de menú penjades"

 #. module: database_cleanup
 #: code:addons/database_cleanup/models/purge_modules.py:79
 #, python-format
 msgid "No modules found to purge"
-msgstr ""
+msgstr "No s'han trobat mòduls per purgar"

 #. module: database_cleanup
 #: code:addons/database_cleanup/models/purge_columns.py:123
 #, python-format
 msgid "No orphaned columns found"
-msgstr ""
+msgstr "No s'han trobat columnes orfes"

 #. module: database_cleanup
 #: code:addons/database_cleanup/models/purge_data.py:64
 #, python-format
 msgid "No orphaned data entries found"
-msgstr ""
+msgstr "No s'han trobat entrades de dades orfes"

 #. module: database_cleanup
 #: code:addons/database_cleanup/models/purge_models.py:116
 #, python-format
 msgid "No orphaned models found"
-msgstr ""
+msgstr "No s'han trobat models orfes"

 #. module: database_cleanup
 #: code:addons/database_cleanup/models/purge_tables.py:102
 #, python-format
 msgid "No orphaned tables found"
-msgstr ""
+msgstr "No s'han trobat taules orfes"

 #. module: database_cleanup
 #: model:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
@ -336,7 +330,7 @@ msgstr ""
 #: model:ir.actions.server,name:database_cleanup.action_purge_table_line
 #: model:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
 msgid "Purge"
-msgstr ""
+msgstr "Purgar"

 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_wizard_id
@ -347,40 +341,34 @@ msgstr ""
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_wizard_id
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table_wizard_id
 msgid "Purge Wizard"
-msgstr ""
+msgstr "Assistent de purga"

 #. module: database_cleanup
 #: model:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
 msgid "Purge all"
-msgstr ""
+msgstr "Purgar tot"

 #. module: database_cleanup
 #: model:ir.actions.server,name:database_cleanup.action_purge_columns
 #: model:ir.model,name:database_cleanup.model_cleanup_purge_wizard_column
 msgid "Purge columns"
-msgstr ""
+msgstr "Purgar columnes"

 #. module: database_cleanup
 #: model:ir.model,name:database_cleanup.model_cleanup_purge_wizard_data
 msgid "Purge data"
-msgstr ""
+msgstr "Purgar dades"

 #. module: database_cleanup
 #: model:ir.actions.server,name:database_cleanup.action_purge_data
 msgid "Purge data entries that refer to missing resources"
-msgstr ""
-
-#. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard_purge_line_ids
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_purge_line_ids
-msgid "Purge line ids"
-msgstr ""
+msgstr "Purgar entrades de dades que fan referència a recursos perduts"

 #. module: database_cleanup
 #: model:ir.actions.server,name:database_cleanup.action_purge_menus
 #: model:ir.model,name:database_cleanup.model_cleanup_purge_wizard_menu
 msgid "Purge menus"
-msgstr ""
+msgstr "Purgar menús"

 #. module: database_cleanup
 #: model:ir.actions.server,name:database_cleanup.action_purge_models
@ -388,38 +376,38 @@ msgstr ""
 #: model:ir.model,name:database_cleanup.model_cleanup_purge_wizard_model
 #: model:ir.ui.view,arch_db:database_cleanup.tree_purge_line
 msgid "Purge models"
-msgstr ""
+msgstr "Purgar models"

 #. module: database_cleanup
 #: model:ir.actions.server,name:database_cleanup.action_purge_modules
 #: model:ir.model,name:database_cleanup.model_cleanup_purge_wizard_module
 msgid "Purge modules"
-msgstr ""
+msgstr "Purgar mòduls"

 #. module: database_cleanup
 #: model:ir.ui.menu,name:database_cleanup.menu_purge_columns
 msgid "Purge obsolete columns"
-msgstr ""
+msgstr "Purgar columnes obsoletes"

 #. module: database_cleanup
 #: model:ir.ui.menu,name:database_cleanup.menu_purge_data
 msgid "Purge obsolete data entries"
-msgstr ""
+msgstr "Purgar entrades de dades obsoletes"

 #. module: database_cleanup
 #: model:ir.ui.menu,name:database_cleanup.menu_purge_menus
 msgid "Purge obsolete menu entries"
-msgstr ""
+msgstr "Purgar entrades de menú obsoletes"

 #. module: database_cleanup
 #: model:ir.ui.menu,name:database_cleanup.menu_purge_models
 msgid "Purge obsolete models"
-msgstr ""
+msgstr "Purgar models obsolets"

 #. module: database_cleanup
 #: model:ir.ui.menu,name:database_cleanup.menu_purge_modules
 msgid "Purge obsolete modules"
-msgstr ""
+msgstr "Purgar mòduls obsolets"

 #. module: database_cleanup
 #: model:ir.ui.menu,name:database_cleanup.menu_purge_property
@ -429,30 +417,18 @@ msgstr ""
 #. module: database_cleanup
 #: model:ir.ui.menu,name:database_cleanup.menu_purge_tables
 msgid "Purge obsolete tables"
-msgstr ""
-
-#. module: database_cleanup
-#: model:ir.actions.server,name:database_cleanup.action_purge_property
-#: model:ir.model,name:database_cleanup.model_cleanup_purge_line_property
-#: model:ir.model,name:database_cleanup.model_cleanup_purge_wizard_property
-msgid "Purge properties"
-msgstr ""
-
-#. module: database_cleanup
-#: model:ir.model,name:database_cleanup.model_cleanup_purge_wizard
-msgid "Purge stuff"
-msgstr ""
+msgstr "Purgar taules obsoletes"

 #. module: database_cleanup
 #: model:ir.actions.server,name:database_cleanup.action_purge_tables
 #: model:ir.model,name:database_cleanup.model_cleanup_purge_wizard_table
 msgid "Purge tables"
-msgstr ""
+msgstr "Purgar taules"

 #. module: database_cleanup
 #: model:ir.ui.view,arch_db:database_cleanup.tree_purge_line
 msgid "Purge this model"
-msgstr ""
+msgstr "Purgar aquest model"

 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_purged
@ -464,7 +440,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_purged
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table_purged
 msgid "Purged"
-msgstr ""
+msgstr "Purgat"

 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_reason
@ -479,61 +455,16 @@ msgstr ""
 #. module: database_cleanup
 #: model:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
 msgid "Select lines"
-msgstr ""
+msgstr "Seleccionar línies"

 #. module: database_cleanup
 #: code:addons/database_cleanup/models/purge_wizard.py:73
 #, python-format
 msgid "Select lines to purge"
-msgstr ""
+msgstr "Seleccionar línies a purgar"

 #. module: database_cleanup
 #: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table_purge_line_ids
 msgid "Tables to purge"
-msgstr ""
+msgstr "Taules a purgar"

-#. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_wizard_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_wizard_id
-msgid "Wizard id"
-msgstr ""
-
-#. module: database_cleanup
-#: model:ir.model,name:database_cleanup.model_cleanup_create_indexes_line
-msgid "cleanup.create_indexes.line"
-msgstr ""
-
-#. module: database_cleanup
-#: model:ir.model,name:database_cleanup.model_cleanup_purge_line
-msgid "cleanup.purge.line"
-msgstr ""
-
-#. module: database_cleanup
-#: model:ir.model,name:database_cleanup.model_cleanup_purge_line_column
-msgid "cleanup.purge.line.column"
-msgstr ""
-
-#. module: database_cleanup
-#: model:ir.model,name:database_cleanup.model_cleanup_purge_line_data
-msgid "cleanup.purge.line.data"
-msgstr ""
-
-#. module: database_cleanup
-#: model:ir.model,name:database_cleanup.model_cleanup_purge_line_menu
-msgid "cleanup.purge.line.menu"
-msgstr ""
-
-#. module: database_cleanup
-#: model:ir.model,name:database_cleanup.model_cleanup_purge_line_module
-msgid "cleanup.purge.line.module"
-msgstr ""
-
-#. module: database_cleanup
-#: model:ir.model,name:database_cleanup.model_cleanup_purge_line_table
-msgid "cleanup.purge.line.table"
-msgstr ""
-
-#. module: database_cleanup
-#: model:ir.model,name:database_cleanup.model_ir_model_data
-msgid "ir.model.data"
-msgstr ""
--- a/database_cleanup/i18n/database_cleanup.pot
+++ b/database_cleanup/i18n/database_cleanup.pot
@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-08-11 06:45+0000\n"
 "PO-Revision-Date: 2015-08-11 06:45+0000\n"
--- a/database_cleanup/i18n/de.po
+++ b/database_cleanup/i18n/de.po
@ -7,7 +7,7 @@
 # Rudolf Schnapka <rs@techno-flex.de>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/el_GR.po
+++ b/database_cleanup/i18n/el_GR.po
@ -6,7 +6,7 @@
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/es.po
+++ b/database_cleanup/i18n/es.po
@ -6,7 +6,7 @@
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/es_ES.po
+++ b/database_cleanup/i18n/es_ES.po
@ -6,7 +6,7 @@
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/fi.po
+++ b/database_cleanup/i18n/fi.po
@ -7,7 +7,7 @@
 # Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/fr.po
+++ b/database_cleanup/i18n/fr.po
@ -8,7 +8,7 @@
 # dglucose <eric.lemesre@gmail.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/fr_CA.po
+++ b/database_cleanup/i18n/fr_CA.po
@ -6,7 +6,7 @@
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/gl.po
+++ b/database_cleanup/i18n/gl.po
@ -7,7 +7,7 @@
 # César Castro Cruz <ulmroan@gmail.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/hr.po
+++ b/database_cleanup/i18n/hr.po
@ -7,7 +7,7 @@
 # Ana-Maria Olujić <ana-maria.olujic@slobodni-programi.hr>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/hr_HR.po
+++ b/database_cleanup/i18n/hr_HR.po
@ -6,7 +6,7 @@
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/it.po
+++ b/database_cleanup/i18n/it.po
@ -7,7 +7,7 @@
 # Paolo Valier <paolo.valier@hotmail.it>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/nl.po
+++ b/database_cleanup/i18n/nl.po
@ -8,7 +8,7 @@
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/pt.po
+++ b/database_cleanup/i18n/pt.po
@ -6,7 +6,7 @@
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/pt_BR.po
+++ b/database_cleanup/i18n/pt_BR.po
@ -7,7 +7,7 @@
 # danimaribeiro <danimaribeiro@gmail.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/pt_PT.po
+++ b/database_cleanup/i18n/pt_PT.po
@ -7,7 +7,7 @@
 # Pedro Castro Silva <pedrocs@sossia.pt>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/ru.po
+++ b/database_cleanup/i18n/ru.po
@ -6,7 +6,7 @@
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/sl.po
+++ b/database_cleanup/i18n/sl.po
@ -7,7 +7,7 @@
 # Matjaž Mozetič <m.mozetic@matmoz.si>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/tr.po
+++ b/database_cleanup/i18n/tr.po
@ -7,7 +7,7 @@
 # Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/i18n/zh_CN.po
+++ b/database_cleanup/i18n/zh_CN.po
@ -6,7 +6,7 @@
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-19 18:00+0000\n"
 "PO-Revision-Date: 2017-04-19 18:00+0000\n"
--- a/database_cleanup/models/create_indexes.py
+++ b/database_cleanup/models/create_indexes.py
@ -2,7 +2,7 @@
 # © 2017 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from ..identifier_adapter import IdentifierAdapter
-from openerp import api, fields, models
+from odoo import api, fields, models


 class CreateIndexesLine(models.TransientModel):
@ -48,6 +48,7 @@ class CreateIndexesWizard(models.TransientModel):

    @api.multi
    def find(self):
+        res = list()
        for field in self.env['ir.model.fields'].search([
                ('index', '=', True),
        ]):
@ -74,7 +75,8 @@ class CreateIndexesWizard(models.TransientModel):
            if not self.env.cr.rowcount:
                continue

-            yield (0, 0, {
+            res.append((0, 0, {
                'name': '%s.%s' % (field.model, field.name),
                'field_id': field.id,
-            })
+            }))
+        return res
--- a/database_cleanup/models/purge_columns.py
+++ b/database_cleanup/models/purge_columns.py
@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # © 2014-2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openerp import _, api, fields, models
-from openerp.exceptions import UserError
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
 from ..identifier_adapter import IdentifierAdapter


@ -20,7 +20,12 @@ class CleanupPurgeLineColumn(models.TransientModel):
        """
        Unlink columns upon manual confirmation.
        """
-        for line in self:
+        if self:
+            objs = self
+        else:
+            objs = self.env['cleanup.purge.line.column']\
+                .browse(self._context.get('active_ids'))
+        for line in objs:
            if line.purged:
                continue
            model_pool = self.env[line.model_id.model]
@ -71,12 +76,10 @@ class CleanupPurgeWizardColumn(models.TransientModel):
        of fields which have been removed
        """
        columns = list(set([
-            column
+            column.name
            for model_pool in model_pools
-            for column in model_pool._columns
-            if not (isinstance(model_pool._columns[column],
-                               fields.fields.function) and
-                    not model_pool._columns[column].store)
+            for column in model_pool._fields.values()
+            if not (column.compute is not None and not column.store)
        ]))
        columns += models.MAGIC_COLUMNS
        columns += self.blacklist.get(model_pools[0]._table, [])
--- a/database_cleanup/models/purge_data.py
+++ b/database_cleanup/models/purge_data.py
@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # © 2014-2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openerp import _, api, fields, models
-from openerp.exceptions import UserError
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
 from ..identifier_adapter import IdentifierAdapter


@ -17,10 +17,15 @@ class CleanupPurgeLineData(models.TransientModel):
    @api.multi
    def purge(self):
        """Unlink data entries upon manual confirmation."""
-        to_unlink = self.filtered(lambda x: not x.purged and x.data_id)
+        if self:
+            objs = self
+        else:
+            objs = self.env['cleanup.purge.line.data']\
+                .browse(self._context.get('active_ids'))
+        to_unlink = objs.filtered(lambda x: not x.purged and x.data_id)
        self.logger.info('Purging data entries: %s', to_unlink.mapped('name'))
        to_unlink.mapped('data_id').unlink()
-        return self.write({'purged': True})
+        return to_unlink.write({'purged': True})


 class CleanupPurgeWizardData(models.TransientModel):
--- a/database_cleanup/models/purge_menus.py
+++ b/database_cleanup/models/purge_menus.py
@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # © 2014-2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openerp import _, api, fields, models
-from openerp.exceptions import UserError
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError


 class CleanupPurgeLineMenu(models.TransientModel):
@ -15,8 +15,16 @@ class CleanupPurgeLineMenu(models.TransientModel):

    @api.multi
    def purge(self):
-        self.mapped('menu_id').unlink()
-        return self.write({'purged': True})
+        """Unlink menu entries upon manual confirmation."""
+        if self:
+            objs = self
+        else:
+            objs = self.env['cleanup.purge.line.menu']\
+                .browse(self._context.get('active_ids'))
+        to_unlink = objs.filtered(lambda x: not x.purged and x.menu_id)
+        self.logger.info('Purging menu entries: %s', to_unlink.mapped('name'))
+        to_unlink.mapped('menu_id').unlink()
+        return to_unlink.write({'purged': True})


 class CleanupPurgeWizardMenu(models.TransientModel):
--- a/database_cleanup/models/purge_models.py
+++ b/database_cleanup/models/purge_models.py
@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 # © 2014-2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openerp import _, api, models, fields
-from openerp.exceptions import UserError
-from openerp.addons.base.ir.ir_model import MODULE_UNINSTALL_FLAG
+from odoo import _, api, models, fields
+from odoo.exceptions import UserError
+from odoo.addons.base.ir.ir_model import MODULE_UNINSTALL_FLAG


 class IrModel(models.Model):
    _inherit = 'ir.model'

-    @api.multi
    def _drop_table(self):
        # Allow to skip this step during model unlink
        # The super method crashes if the model cannot be instantiated
@ -17,25 +16,23 @@ class IrModel(models.Model):
            return True
        return super(IrModel, self)._drop_table()

-    @api.multi
-    def _inherited_models(self, field_name, arg):
+    @api.depends()
+    def _inherited_models(self):
        """this function crashes for undefined models"""
-        result = dict((i, []) for i in self.ids)
-        existing_model_ids = [
-            this.id for this in self if this.model in self.env
-        ]
-        super_result = super(IrModel, self.browse(existing_model_ids))\
-            ._inherited_models(field_name, arg)
-        result.update(super_result)
-        return result
-
-    def _register_hook(self, cr):
-        # patch the function field instead of overwriting it
-        if self._columns['inherited_model_ids']._fnct !=\
-                self._inherited_models.__func__:
-            self._columns['inherited_model_ids']._fnct =\
-                self._inherited_models.__func__
-        return super(IrModel, self)._register_hook(cr)
+        existing_model_ids = self.filtered(lambda x: x.model in self.env)
+        super(IrModel, existing_model_ids)._inherited_models()
+
+
+class IrModelFields(models.Model):
+    _inherit = 'ir.model.fields'
+
+    @api.multi
+    def _prepare_update(self):
+        # Allow to skip this step during model unlink
+        # The super method crashes if the model cannot be instantiated
+        if self.env.context.get('no_prepare_update'):
+            return True
+        return super(IrModelFields, self)._prepare_update()


 class CleanupPurgeLineModel(models.TransientModel):
@ -55,9 +52,15 @@ class CleanupPurgeLineModel(models.TransientModel):
            MODULE_UNINSTALL_FLAG: True,
            'no_drop_table': True,
            'purge': True,
+            'no_prepare_update': True,
        }

-        for line in self:
+        if self:
+            objs = self
+        else:
+            objs = self.env['cleanup.purge.line.model']\
+                .browse(self._context.get('active_ids'))
+        for line in objs:
            self.env.cr.execute(
                "SELECT id, model from ir_model WHERE model = %s",
                (line.name,))
--- a/database_cleanup/models/purge_modules.py
+++ b/database_cleanup/models/purge_modules.py
@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # © 2014-2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openerp import _, api, fields, models
-from openerp.exceptions import UserError
-from openerp.modules.registry import RegistryManager
-from openerp.modules.module import get_module_path
-from openerp.addons.base.ir.ir_model import MODULE_UNINSTALL_FLAG
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+from odoo.modules.registry import RegistryManager
+from odoo.modules.module import get_module_path
+from odoo.addons.base.ir.ir_model import MODULE_UNINSTALL_FLAG


 class IrModelData(models.Model):
@ -41,7 +41,12 @@ class CleanupPurgeLineModule(models.TransientModel):
        Uninstall modules upon manual confirmation, then reload
        the database.
        """
-        module_names = self.filtered(lambda x: not x.purged).mapped('name')
+        if self:
+            objs = self
+        else:
+            objs = self.env['cleanup.purge.line.module']\
+                .browse(self._context.get('active_ids'))
+        module_names = objs.filtered(lambda x: not x.purged).mapped('name')
        modules = self.env['ir.module.module'].search([
            ('name', 'in', module_names)
        ])
@ -54,7 +59,7 @@ class CleanupPurgeLineModule(models.TransientModel):
        self.env.cr.commit()  # pylint: disable=invalid-commit
        RegistryManager.new(self.env.cr.dbname, update_module=True)
        modules.unlink()
-        return self.write({'purged': True})
+        return objs.write({'purged': True})


 class CleanupPurgeWizardModule(models.TransientModel):
--- a/database_cleanup/models/purge_properties.py
+++ b/database_cleanup/models/purge_properties.py
@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # © 2017 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openerp import api, models, fields
+from odoo import api, models, fields
 REASON_DUPLICATE = 1
 REASON_DEFAULT = 2

@ -76,7 +76,7 @@ class CleanupPurgeWizardProperty(models.TransientModel):
            for redundant_property in self.env['ir.property'].search(domain):
                result.append({
                    'name': '%s@%s: %s' % (
-                        prop.name, prop.res_id, prop.get_by_record(prop)
+                        prop.name, prop.res_id, prop.get_by_record()
                    ),
                    'property_id': redundant_property.id,
                    'reason': REASON_DEFAULT,
@ -98,7 +98,7 @@ class CleanupPurgeWizardProperty(models.TransientModel):
            ])[1:]:
                result.append({
                    'name': '%s@%s: %s' % (
-                        prop.name, prop.res_id, prop.get_by_record(prop)
+                        prop.name, prop.res_id, prop.get_by_record()
                    ),
                    'property_id': prop.id,
                    'reason': REASON_DUPLICATE,
--- a/database_cleanup/models/purge_tables.py
+++ b/database_cleanup/models/purge_tables.py
@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # © 2014-2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openerp import api, fields, models, _
-from openerp.exceptions import UserError
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
 from ..identifier_adapter import IdentifierAdapter


@ -18,8 +18,13 @@ class CleanupPurgeLineTable(models.TransientModel):
        """
        Unlink tables upon manual confirmation.
        """
-        tables = self.mapped('name')
-        for line in self:
+        if self:
+            objs = self
+        else:
+            objs = self.env['cleanup.purge.line.table']\
+                .browse(self._context.get('active_ids'))
+        tables = objs.mapped('name')
+        for line in objs:
            if line.purged:
                continue

@ -84,11 +89,10 @@ class CleanupPurgeWizardTable(models.TransientModel):
            model_pool = self.env[model.model]
            known_tables.append(model_pool._table)
            known_tables += [
-                column._sql_names(model_pool)[0]
-                for column in model_pool._columns.values()
-                if (column._type == 'many2many' and
-                    hasattr(column, '_rel'))  # unstored function fields of
-                                              # type m2m don't have _rel
+                column.relation
+                for column in model_pool._fields.values()
+                if column.type == 'many2many' and
+                (column.compute is None or column.store)
            ]

        self.env.cr.execute(
--- a/database_cleanup/models/purge_wizard.py
+++ b/database_cleanup/models/purge_wizard.py
@ -2,8 +2,8 @@
 # © 2014-2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 import logging
-from openerp import _, api, fields, models
-from openerp.exceptions import AccessDenied
+from odoo import _, api, fields, models
+from odoo.exceptions import AccessDenied


 class CleanupPurgeLine(models.AbstractModel):
@ -15,7 +15,7 @@ class CleanupPurgeLine(models.AbstractModel):
    purged = fields.Boolean('Purged', readonly=True)
    wizard_id = fields.Many2one('cleanup.purge.wizard')

-    logger = logging.getLogger('openerp.addons.database_cleanup')
+    logger = logging.getLogger('odoo.addons.database_cleanup')

    @api.multi
    def purge(self):
--- a/database_cleanup/tests/test_database_cleanup.py
+++ b/database_cleanup/tests/test_database_cleanup.py
@ -2,9 +2,9 @@
 # © 2016 Therp BV <http://therp.nl>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from psycopg2 import ProgrammingError
-from openerp.modules.registry import RegistryManager
-from openerp.tools import config
-from openerp.tests.common import TransactionCase, at_install, post_install
+from odoo.modules.registry import Registry
+from odoo.tools import config
+from odoo.tests.common import TransactionCase, at_install, post_install


 # Use post_install to get all models loaded more info: odoo/odoo#13458
@ -15,6 +15,12 @@ class TestDatabaseCleanup(TransactionCase):
        super(TestDatabaseCleanup, self).setUp()
        self.module = None
        self.model = None
+        # Create one property for tests
+        self.env['ir.property'].create({
+            'fields_id': self.env.ref('base.field_res_partner_name').id,
+            'type': 'char',
+            'value_text': 'My default partner name',
+        })

    def test_database_cleanup(self):
        # delete some index and check if our module recreated it
@ -33,7 +39,7 @@ class TestDatabaseCleanup(TransactionCase):
        purge_property.purge_all()
        self.assertFalse(duplicate_property.exists())
        # create an orphaned column
-        self.cr.execute(
+        self.env.cr.execute(
            'alter table res_partner add column database_cleanup_test int')
        # We need use a model that is not blocked (Avoid use res.users)
        partner_model = self.env['ir.model'].search([
@ -45,16 +51,16 @@ class TestDatabaseCleanup(TransactionCase):
        purge_columns.purge_all()
        # must be removed by the wizard
        with self.assertRaises(ProgrammingError):
-            with self.registry.cursor() as cr:
+            with self.env.registry.cursor() as cr:
                cr.execute('select database_cleanup_test from res_partner')

        # create a data entry pointing nowhere
-        self.cr.execute('select max(id) + 1 from res_users')
+        self.env.cr.execute('select max(id) + 1 from res_users')
        self.env['ir.model.data'].create({
            'module': 'database_cleanup',
            'name': 'test_no_data_entry',
            'model': 'res.users',
-            'res_id': self.cr.fetchone()[0],
+            'res_id': self.env.cr.fetchone()[0],
        })
        purge_data = self.env['cleanup.purge.wizard.data'].create({})
        purge_data.purge_all()
@ -70,8 +76,8 @@ class TestDatabaseCleanup(TransactionCase):
        self.env.cr.execute(
            'insert into ir_attachment (name, res_model, res_id, type) values '
            "('test attachment', 'database.cleanup.test.model', 42, 'binary')")
-        self.registry.models.pop('x_database.cleanup.test.model')
-        self.registry._pure_function_fields.pop(
+        self.env.registry.models.pop('x_database.cleanup.test.model')
+        self.env.registry._fields_by_model.pop(
            'x_database.cleanup.test.model')
        purge_models = self.env['cleanup.purge.wizard.model'].create({})
        purge_models.purge_all()
@ -89,7 +95,7 @@ class TestDatabaseCleanup(TransactionCase):
        # this reloads our registry, and we don't want to run tests twice
        # we also need the original registry for further tests, so save a
        # reference to it
-        original_registry = RegistryManager.registries[self.env.cr.dbname]
+        original_registry = Registry.registries[self.env.cr.dbname]
        config.options['test_enable'] = False
        purge_modules.purge_all()
        config.options['test_enable'] = True
@ -98,15 +104,15 @@ class TestDatabaseCleanup(TransactionCase):
            ('name', '=', 'database_cleanup_test'),
        ]))
        # reset afterwards
-        RegistryManager.registries[self.env.cr.dbname] = original_registry
+        Registry.registries[self.env.cr.dbname] = original_registry

        # create an orphaned table
        self.env.cr.execute('create table database_cleanup_test (test int)')
        purge_tables = self.env['cleanup.purge.wizard.table'].create({})
        purge_tables.purge_all()
        with self.assertRaises(ProgrammingError):
-            with self.registry.cursor() as cr:
-                self.env.cr.execute('select * from database_cleanup_test')
+            with self.env.registry.cursor() as cr:
+                cr.execute('select * from database_cleanup_test')

    def tearDown(self):
        super(TestDatabaseCleanup, self).tearDown()
--- a/database_cleanup/views/create_indexes.xml
+++ b/database_cleanup/views/create_indexes.xml
@ -19,7 +19,7 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_create_indexes_wizard" />
-        <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
+        <field name="code">action = env.get('cleanup.create_indexes.wizard').get_wizard_action()</field>
    </record>

    <record id="cleanup_create_indexes_line_view_tree" model="ir.ui.view">
@ -39,7 +39,7 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_create_indexes_line" />
-        <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
+        <field name="code">env.get('cleanup.create_indexes.line').purge()</field>
    </record>

    <record id="cleanup_create_indexes_line_action_value" model="ir.values">
--- a/database_cleanup/views/menu.xml
+++ b/database_cleanup/views/menu.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
+<odoo>
    <record model="ir.ui.menu" id="menu_database_cleanup">
        <field name="name">Database cleanup</field>
        <field name="sequence" eval="10" />
@ -65,6 +63,4 @@
        <field name="action" ref="action_purge_property" />
        <field name="parent_id" ref="menu_database_cleanup"/>
    </record>
-
-    </data>
-</openerp>
+</odoo>
--- a/database_cleanup/views/purge_columns.xml
+++ b/database_cleanup/views/purge_columns.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
    <record id="purge_columns_view" model="ir.ui.view">
        <field name="model">cleanup.purge.wizard.column</field>
        <field name="inherit_id" ref="form_purge_wizard" />
@ -17,7 +16,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_column" />
-            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
+        <field name="code">
+            action = env.get('cleanup.purge.wizard.column').get_wizard_action()
+        </field>
    </record>

    <record id="purge_column_line_tree" model="ir.ui.view">
@ -36,7 +37,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_column" />
-            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
+        <field name="code">
+            env.get('cleanup.purge.line.column').purge()
+        </field>
    </record>

    <record id="action_purge_column_line_value" model="ir.values">
@ -46,5 +49,4 @@
        <field name="model">cleanup.purge.line.column</field>
        <field name="value" eval="'ir.actions.server,%d' % ref('database_cleanup.action_purge_column_line')" />
    </record>
-    </data>
-</openerp>
+</odoo>
--- a/database_cleanup/views/purge_data.xml
+++ b/database_cleanup/views/purge_data.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
    <record id="purge_data_view" model="ir.ui.view">
        <field name="model">cleanup.purge.wizard.data</field>
        <field name="inherit_id" ref="form_purge_wizard" />
@ -17,7 +16,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_data" />
-            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
+        <field name="code">
+            action = env.get('cleanup.purge.wizard.data').get_wizard_action()
+        </field>
    </record>

    <record id="purge_data_line_tree" model="ir.ui.view">
@ -36,7 +37,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_data" />
-            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
+        <field name="code">
+            env.get('cleanup.purge.line.data').purge()
+        </field>
    </record>

    <record id="action_purge_data_line_value" model="ir.values">
@ -46,5 +49,4 @@
        <field name="model">cleanup.purge.line.data</field>
        <field name="value" eval="'ir.actions.server,%d' % ref('database_cleanup.action_purge_data_line')" />
    </record>
-    </data>
-</openerp>
+</odoo>
--- a/database_cleanup/views/purge_menus.xml
+++ b/database_cleanup/views/purge_menus.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
    <record id="purge_menus_view" model="ir.ui.view">
        <field name="model">cleanup.purge.wizard.menu</field>
        <field name="inherit_id" ref="form_purge_wizard" />
@ -15,7 +14,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_menu" />
-            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
+        <field name="code">
+            action = env.get('cleanup.purge.wizard.menu').get_wizard_action()
+        </field>
    </record>

    <record id="purge_menu_line_tree" model="ir.ui.view">
@ -32,7 +33,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_menu" />
-            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
+        <field name="code">
+            env.get('cleanup.purge.line.menu').purge()
+        </field>
    </record>

    <record id="action_purge_menu_line_value" model="ir.values">
@ -42,6 +45,4 @@
        <field name="model">cleanup.purge.line.menu</field>
        <field name="value" eval="'ir.actions.server,%d' % ref('database_cleanup.action_purge_menu_line')" />
    </record>
-
-    </data>
-</openerp>
+</odoo>
--- a/database_cleanup/views/purge_models.xml
+++ b/database_cleanup/views/purge_models.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
    <record id="purge_models_view" model="ir.ui.view">
        <field name="model">cleanup.purge.wizard.model</field>
        <field name="inherit_id" ref="form_purge_wizard" />
@ -15,7 +14,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_model" />
-            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
+        <field name="code">
+            action = env.get('cleanup.purge.wizard.model').get_wizard_action()
+        </field>
    </record>

    <record id="purge_model_line_tree" model="ir.ui.view">
@ -32,7 +33,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_model" />
-            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
+        <field name="code">
+            env.get('cleanup.purge.line.model').purge()
+        </field>
    </record>

    <record id="action_purge_model_line_value" model="ir.values">
@ -42,6 +45,4 @@
        <field name="model">cleanup.purge.line.model</field>
        <field name="value" eval="'ir.actions.server,%d' % ref('database_cleanup.action_purge_model_line')" />
    </record>
-
-    </data>
-</openerp>
+</odoo>
--- a/database_cleanup/views/purge_modules.xml
+++ b/database_cleanup/views/purge_modules.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
    <record id="purge_modules_view" model="ir.ui.view">
        <field name="model">cleanup.purge.wizard.module</field>
        <field name="inherit_id" ref="form_purge_wizard" />
@ -15,7 +14,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_module" />
-            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
+        <field name="code">
+            action = env.get('cleanup.purge.wizard.module').get_wizard_action()
+        </field>
    </record>

    <record id="purge_module_line_tree" model="ir.ui.view">
@ -32,7 +33,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_module" />
-            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
+        <field name="code">
+            env.get('cleanup.purge.line.module').purge()
+        </field>
    </record>

    <record id="action_purge_module_line_value" model="ir.values">
@ -42,6 +45,4 @@
        <field name="model">cleanup.purge.line.module</field>
        <field name="value" eval="'ir.actions.server,%d' % ref('database_cleanup.action_purge_module_line')" />
    </record>
-
-    </data>
-</openerp>
+</odoo>
--- a/database_cleanup/views/purge_properties.xml
+++ b/database_cleanup/views/purge_properties.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
    <record id="purge_property_view" model="ir.ui.view">
        <field name="model">cleanup.purge.wizard.property</field>
        <field name="inherit_id" ref="form_purge_wizard" />
@ -15,7 +14,7 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_property" />
-            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
+        <field name="code">action = env.get('cleanup.purge.wizard.property').get_wizard_action()</field>
    </record>

    <record id="purge_property_line_tree" model="ir.ui.view">
@ -34,7 +33,7 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_property" />
-            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
+        <field name="code">env.get('cleanup.purge.line.property').purge()</field>
    </record>

    <record id="action_purge_property_line_value" model="ir.values">
@ -45,5 +44,4 @@
        <field name="value" eval="'ir.actions.server,%d' % ref('database_cleanup.action_purge_property_line')" />
    </record>

-    </data>
-</openerp>
+</odoo>
--- a/database_cleanup/views/purge_tables.xml
+++ b/database_cleanup/views/purge_tables.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
    <record id="purge_tables_view" model="ir.ui.view">
        <field name="model">cleanup.purge.wizard.table</field>
        <field name="inherit_id" ref="form_purge_wizard" />
@ -15,7 +14,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_wizard_table" />
-            <field name="code">action = self.get_wizard_action(cr, uid, context=context)</field>
+        <field name="code">
+            action = env.get('cleanup.purge.wizard.table').get_wizard_action()
+        </field>
    </record>

    <record id="purge_table_line_tree" model="ir.ui.view">
@ -32,7 +33,9 @@
        <field name="type">ir.actions.server</field>
        <field name="state">code</field>
        <field name="model_id" ref="database_cleanup.model_cleanup_purge_line_table" />
-            <field name="code">self.purge(cr, uid, context.get('active_ids', []), context)</field>
+        <field name="code">
+            env.get('cleanup.purge.line.table').purge()
+        </field>
    </record>

    <record id="action_purge_table_line_value" model="ir.values">
@ -42,5 +45,4 @@
        <field name="model">cleanup.purge.line.table</field>
        <field name="value" eval="'ir.actions.server,%d' % ref('database_cleanup.action_purge_table_line')" />
    </record>
-    </data>
-</openerp>
+</odoo>
--- a/database_cleanup/views/purge_wizard.xml
+++ b/database_cleanup/views/purge_wizard.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
    <record id="form_purge_wizard" model="ir.ui.view">
        <field name="model">cleanup.purge.wizard</field>
        <field name="arch" type="xml">
@ -9,6 +8,9 @@
                    <button type="object" name="purge_all" string="Purge all" class="oe_highlight" />
                    <button type="object" name="select_lines" string="Select lines" />
                </header>
+                <div attrs="{'invisible': [('purge_line_ids', '!=', [])]}">
+                    Nothing found to clean up.
+                </div>
                <field name="purge_line_ids" attrs="{'invisible': [('purge_line_ids', '=', [])]}">
                    <form>
                        <group>
@ -22,9 +24,6 @@
                        </footer>
                    </form>
                </field>
-                    <div attrs="{'invisible': [('purge_line_ids', '!=', [])]}">
-                        Nothing found to clean up.
-                    </div>
            </form>
        </field>
    </record>
@ -40,5 +39,4 @@
            </tree>
        </field>
    </record>
-    </data>
-</openerp>
+</odoo>