diff options
| author | Xavier Morel <xmo@odoo.com> | 2020-07-16 09:49:10 +0000 |
|---|---|---|
| committer | Xavier Morel <xmo@odoo.com> | 2020-07-28 13:03:13 +0000 |
| commit | 6835aeb0de6895f7f4d6b23e0b4654465ef21d6a (patch) | |
| tree | a01960df831f7f6fee07b99851dfc49a0978b222 /odoo | |
| parent | 96a3265118df686a0175b240c9636cfd2b53a492 (diff) | |
[REM] core, *: deprecate <act_window> and <report>
Convert deprecated tags through the codebase.
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/addons/base/report/ir_model_report.xml | 16 | ||||
| -rw-r--r-- | odoo/addons/base/report/ir_module_reports.xml | 16 | ||||
| -rw-r--r-- | odoo/addons/base/views/ir_config_parameter_views.xml | 5 | ||||
| -rw-r--r-- | odoo/addons/base/views/ir_model_views.xml | 8 | ||||
| -rw-r--r-- | odoo/addons/base/views/ir_ui_view_views.xml | 14 | ||||
| -rw-r--r-- | odoo/addons/base/views/res_currency_views.xml | 16 | ||||
| -rw-r--r-- | odoo/addons/base/views/res_users_views.xml | 12 | ||||
| -rw-r--r-- | odoo/addons/base/wizard/base_partner_merge_views.xml | 16 | ||||
| -rw-r--r-- | odoo/addons/test_action_bindings/test_data.xml | 34 | ||||
| -rw-r--r-- | odoo/tools/convert.py | 3 |
10 files changed, 80 insertions, 60 deletions
diff --git a/odoo/addons/base/report/ir_model_report.xml b/odoo/addons/base/report/ir_model_report.xml index 4baa1daf989..5f3960fc118 100644 --- a/odoo/addons/base/report/ir_model_report.xml +++ b/odoo/addons/base/report/ir_model_report.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <report - id="report_ir_model_overview" - string="Model Overview" - model="ir.model" - report_type="qweb-pdf" - name="base.report_irmodeloverview" - file="base.report_irmodeloverview"/> + <record id="report_ir_model_overview" model="ir.actions.report"> + <field name="name">Model Overview</field> + <field name="model">ir.model</field> + <field name="report_type">qweb-pdf</field> + <field name="report_name">base.report_irmodeloverview</field> + <field name="report_file">base.report_irmodeloverview</field> + <field name="binding_model_id" ref="model_ir_model"/> + <field name="binding_type">report</field> + </record> </odoo> diff --git a/odoo/addons/base/report/ir_module_reports.xml b/odoo/addons/base/report/ir_module_reports.xml index bf1acbcd7d1..b4a66c4de7e 100644 --- a/odoo/addons/base/report/ir_module_reports.xml +++ b/odoo/addons/base/report/ir_module_reports.xml @@ -2,13 +2,15 @@ <odoo> <data> - <report - id="ir_module_reference_print" - string="Technical guide" - model="ir.module.module" - report_type="qweb-pdf" - file="base.report_irmodulereference" - name="base.report_irmodulereference"/> + <record id="ir_module_reference_print" model="ir.actions.report"> + <field name="name">Technical guide</field> + <field name="model">ir.module.module</field> + <field name="report_type">qweb-pdf</field> + <field name="report_name">base.report_irmodulereference</field> + <field name="report_file">base.report_irmodulereference</field> + <field name="binding_model_id" ref="model_ir_module_module"/> + <field name="binding_type">report</field> + </record> </data> </odoo> diff --git a/odoo/addons/base/views/ir_config_parameter_views.xml b/odoo/addons/base/views/ir_config_parameter_views.xml index 6480f989a53..5e9d1a6b85c 100644 --- a/odoo/addons/base/views/ir_config_parameter_views.xml +++ b/odoo/addons/base/views/ir_config_parameter_views.xml @@ -31,6 +31,9 @@ </form> </field> </record> - <act_window name="System Parameters" res_model="ir.config_parameter" id="ir_config_list_action"/> + <record id="ir_config_list_action" model="ir.actions.act_window"> + <field name="name">System Parameters</field> + <field name="res_model">ir.config_parameter</field> + </record> <menuitem id="ir_config_menu" name="System Parameters" parent="menu_ir_property" action="ir_config_list_action"/> </odoo> diff --git a/odoo/addons/base/views/ir_model_views.xml b/odoo/addons/base/views/ir_model_views.xml index cdfeaa2dc69..20370cc0026 100644 --- a/odoo/addons/base/views/ir_model_views.xml +++ b/odoo/addons/base/views/ir_model_views.xml @@ -18,7 +18,13 @@ </form> </field> </record> - <act_window context="{'model_id': active_id}" id="act_menu_create" name="Create Menu" res_model="wizard.ir.model.menu.create" target="new" view_mode="form"/> + <record id="act_menu_create" model="ir.actions.act_window"> + <field name="name">Create Menu</field> + <field name="res_model">wizard.ir.model.menu.create</field> + <field name="view_mode">form</field> + <field name="target">new</field> + <field name="context">{'model_id': active_id}</field> + </record> <!-- model --> <record id="view_model_form" model="ir.ui.view"> diff --git a/odoo/addons/base/views/ir_ui_view_views.xml b/odoo/addons/base/views/ir_ui_view_views.xml index 57272c67db2..2dc40047233 100644 --- a/odoo/addons/base/views/ir_ui_view_views.xml +++ b/odoo/addons/base/views/ir_ui_view_views.xml @@ -134,12 +134,14 @@ </field> </record> - <act_window id="reset_view_arch_wizard_action" - name="Compare/Reset" - binding_model="ir.ui.view" binding_views="form,list" - res_model="reset.view.arch.wizard" - view_mode="form" - target="new"/> + <record id="reset_view_arch_wizard_action" model="ir.actions.act_window"> + <field name="name">Compare/Reset</field> + <field name="res_model">reset.view.arch.wizard</field> + <field name="view_mode">form</field> + <field name="target">new</field> + <field name="binding_model_id" ref="model_ir_ui_view"/> + <field name="binding_view_types">form,list</field> + </record> <!-- View customizations --> <record id="view_view_custom_form" model="ir.ui.view"> diff --git a/odoo/addons/base/views/res_currency_views.xml b/odoo/addons/base/views/res_currency_views.xml index 94c41bbd748..b646e028f28 100644 --- a/odoo/addons/base/views/res_currency_views.xml +++ b/odoo/addons/base/views/res_currency_views.xml @@ -45,14 +45,14 @@ </field> </record> - <act_window - id="act_view_currency_rates" - name="Currency Rates" - view_mode='tree,form' - view_id='view_currency_rate_tree' - domain="[('currency_id','=', active_id)]" - context="{'default_currency_id': active_id}" - res_model="res.currency.rate"/> + <record id="act_view_currency_rates" model="ir.actions.act_window"> + <field name="name">Currency Rates</field> + <field name="res_model">res.currency.rate</field> + <field name='view_mode'>tree,form</field> + <field name='view_id' ref='view_currency_rate_tree'/> + <field name="domain">[('currency_id','=', active_id)]</field> + <field name="context">{'default_currency_id': active_id}</field> + </record> <record id="view_currency_search" model="ir.ui.view"> <field name="name">res.currency.search</field> diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml index 4d6c3902d08..812bc8435ff 100644 --- a/odoo/addons/base/views/res_users_views.xml +++ b/odoo/addons/base/views/res_users_views.xml @@ -27,11 +27,13 @@ </tree> </field> </record> - <act_window id="change_password_wizard_action" - name="Change Password" - binding_model="res.users" - res_model="change.password.wizard" - view_mode="form" target="new"/> + <record id="change_password_wizard_action" model="ir.actions.act_window"> + <field name="name">Change Password</field> + <field name="res_model">change.password.wizard</field> + <field name="view_mode">form</field> + <field name="target">new</field> + <field name="binding_model_id" ref="base.model_res_users"/> + </record> <!-- res.groups --> <record id="view_groups_search" model="ir.ui.view"> diff --git a/odoo/addons/base/wizard/base_partner_merge_views.xml b/odoo/addons/base/wizard/base_partner_merge_views.xml index ca44481b0c8..51376dcdf88 100644 --- a/odoo/addons/base/wizard/base_partner_merge_views.xml +++ b/odoo/addons/base/wizard/base_partner_merge_views.xml @@ -98,12 +98,12 @@ </field> </record> - <act_window - id="action_partner_merge" - res_model="base.partner.merge.automatic.wizard" - binding_model="res.partner" - binding_views="list" - target="new" - view_mode="form" - name="Merge"/> + <record id="action_partner_merge" model="ir.actions.act_window"> + <field name="name">Merge</field> + <field name="res_model">base.partner.merge.automatic.wizard</field> + <field name="view_mode">form</field> + <field name="target">new</field> + <field name="binding_model_id" ref="base.model_res_partner"/> + <field name="binding_view_types">list</field> + </record> </odoo> diff --git a/odoo/addons/test_action_bindings/test_data.xml b/odoo/addons/test_action_bindings/test_data.xml index 65670f7a33c..5acd8bb35c1 100644 --- a/odoo/addons/test_action_bindings/test_data.xml +++ b/odoo/addons/test_action_bindings/test_data.xml @@ -1,24 +1,24 @@ <odoo> <!-- bind to all views --> - <act_window - id="act1" - name="Action 1" - res_model="tab.a" - binding_model="tab.a" - binding_views=""/> + <record id="act1" model="ir.actions.act_window"> + <field name="name">Action 1</field> + <field name="res_model">tab.a</field> + <field name="binding_model_id" ref="model_tab_a"/> + <field name="binding_view_types"></field> + </record> <!-- bind to form views --> - <act_window - id="act2" - name="Action 2" - res_model="tab.a" - binding_model="tab.a" - binding_views="form"/> + <record id="act2" model="ir.actions.act_window"> + <field name="name">Action 2</field> + <field name="res_model">tab.a</field> + <field name="binding_model_id" ref="model_tab_a"/> + <field name="binding_view_types">form</field> + </record> <!-- bind to default views (list, form) --> - <act_window - id="act3" - name="Action 3" - res_model="tab.a" - binding_model="tab.a"/> + <record id="act3" model="ir.actions.act_window"> + <field name="name">Action 3</field> + <field name="res_model">tab.a</field> + <field name="binding_model_id" ref="model_tab_a"/> + </record> <record id="r1" model="ir.actions.act_window"> <field name="name">Record 1</field> diff --git a/odoo/tools/convert.py b/odoo/tools/convert.py index 8e6efc7a9dc..0a6a0c23da8 100644 --- a/odoo/tools/convert.py +++ b/odoo/tools/convert.py @@ -8,6 +8,7 @@ import re import subprocess import sys import time +import warnings from datetime import datetime, timedelta from dateutil.relativedelta import relativedelta @@ -288,6 +289,7 @@ form: module.record_id""" % (xml_id,) xml_id = rec.get('id','') self._test_xml_id(xml_id) + warnings.warn(f"The <report> tag is deprecated, use a <record> tag for {xml_id!r}.", DeprecationWarning) if rec.get('groups'): g_names = rec.get('groups','').split(',') @@ -327,6 +329,7 @@ form: module.record_id""" % (xml_id,) name = rec.get('name') xml_id = rec.get('id','') self._test_xml_id(xml_id) + warnings.warn("The <act_window> tag is deprecated, use a <record> for {xml_id!r}.", DeprecationWarning) view_id = False if rec.get('view_id'): view_id = self.id_get(rec.get('view_id')) |
