[IMP] *: use `ref=` instead of `eval="ref('` in xml field tags.

* Code cleanup
* Avoid a safe evaluation of the field value when loading those records.

closes odoo/odoo#44883

Related: odoo/enterprise#8283
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>

25 files changed, 333 insertions, 341 deletions

diff --git a/addons/crm/data/crm_lead_data.xml b/addons/crm/data/crm_lead_data.xml
index 2ef4a9fea08..52f7575aa79 100644
--- a/addons/crm/data/crm_lead_data.xml
+++ b/addons/crm/data/crm_lead_data.xml
@@ -40,21 +40,21 @@
             <field name="sequence">10</field>
             <field name="res_model">crm.team</field>
             <field name="default" eval="True"/>
-            <field name="parent_id" eval="ref('mt_lead_create')"/>
+            <field name="parent_id" ref="mt_lead_create"/>
             <field name="relation_field">team_id</field>
         </record>
         <record id="mt_salesteam_lead_stage" model="mail.message.subtype">
             <field name="name">Opportunity Stage Changed</field>
             <field name="sequence">11</field>
             <field name="res_model">crm.team</field>
-            <field name="parent_id" eval="ref('mt_lead_stage')"/>
+            <field name="parent_id" ref="mt_lead_stage"/>
             <field name="relation_field">team_id</field>
         </record>
         <record id="mt_salesteam_lead_won" model="mail.message.subtype">
             <field name="name">Opportunity Won</field>
             <field name="sequence">12</field>
             <field name="res_model">crm.team</field>
-            <field name="parent_id" eval="ref('mt_lead_won')"/>
+            <field name="parent_id" ref="mt_lead_won"/>
             <field name="relation_field">team_id</field>
         </record>
         <record id="mt_salesteam_lead_lost" model="mail.message.subtype">
@@ -62,7 +62,7 @@
             <field name="sequence">13</field>
             <field name="res_model">crm.team</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_lead_lost')"/>
+            <field name="parent_id" ref="mt_lead_lost"/>
             <field name="relation_field">team_id</field>
         </record>
         <record id="mt_salesteam_lead_restored" model="mail.message.subtype">
@@ -70,7 +70,7 @@
             <field name="sequence">14</field>
             <field name="res_model">crm.team</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_lead_restored')"/>
+            <field name="parent_id" ref="mt_lead_restored"/>
             <field name="relation_field">team_id</field>
         </record>
 
diff --git a/addons/crm/data/crm_lead_prediction_data.xml b/addons/crm/data/crm_lead_prediction_data.xml
index 1a1cbc3675f..e37c6c36e7c 100644
--- a/addons/crm/data/crm_lead_prediction_data.xml
+++ b/addons/crm/data/crm_lead_prediction_data.xml
@@ -3,22 +3,22 @@
     <data noupdate="1">
         <!-- Lead scoring frequency fields -->
         <record id="frequency_field_state_id" model="crm.lead.scoring.frequency.field">
-            <field name="field_id" eval="ref('crm.field_crm_lead__state_id')"/>
+            <field name="field_id" ref="crm.field_crm_lead__state_id"/>
         </record>
         <record id="frequency_field_country_id" model="crm.lead.scoring.frequency.field">
-            <field name="field_id" eval="ref('crm.field_crm_lead__country_id')"/>
+            <field name="field_id" ref="crm.field_crm_lead__country_id"/>
         </record>
         <record id="frequency_field_phone_state" model="crm.lead.scoring.frequency.field">
-            <field name="field_id" eval="ref('crm.field_crm_lead__phone_state')"/>
+            <field name="field_id" ref="crm.field_crm_lead__phone_state"/>
         </record>
         <record id="frequency_field_email_state" model="crm.lead.scoring.frequency.field">
-            <field name="field_id" eval="ref('crm.field_crm_lead__email_state')"/>
+            <field name="field_id" ref="crm.field_crm_lead__email_state"/>
         </record>
         <record id="frequency_field_source_id" model="crm.lead.scoring.frequency.field">
-            <field name="field_id" eval="ref('crm.field_crm_lead__source_id')"/>
+            <field name="field_id" ref="crm.field_crm_lead__source_id"/>
         </record>
         <record id="frequency_field_lang_id" model="crm.lead.scoring.frequency.field">
-            <field name="field_id" eval="ref('crm.field_crm_lead__lang_id')"/>
+            <field name="field_id" ref="crm.field_crm_lead__lang_id"/>
         </record>
         <record id="crm_pls_fields_param" model="ir.config_parameter">
             <field name="key">crm.pls_fields</field>
diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 3289073cb13..a133c93c020 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -232,9 +232,9 @@ Thank you,
             <field name="description">Configure your profile and specify your timezone</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('base.model_res_users')" />
+            <field name="model_id" ref="base.model_res_users"/>
             <field name="domain">[('id','=',user.id),('partner_id.tz', '!=', False)]</field>
-            <field name="action_id" eval="ref('base.action_res_users_my')" />
+            <field name="action_id" ref="base.action_res_users_my"/>
             <field name="res_id_field">user.id</field>
         </record>
 
@@ -243,10 +243,10 @@ Thank you,
             <field name="description">Write some information about your company (specify at least a name)</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('base.model_res_company')" />
+            <field name="model_id" ref="base.model_res_company"/>
             <field name="domain">[('user_ids', 'in', [user.id]), ('name', '=', 'YourCompany')]</field>
             <field name="condition">lower</field>
-            <field name="action_id" eval="ref('base.action_res_company_form')" />
+            <field name="action_id" ref="base.action_res_company_form"/>
             <field name="res_id_field">user.company_id.id</field>
         </record>
 
@@ -254,9 +254,9 @@ Thank you,
             <field name="name">Set your Company Logo</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('base.model_res_company')" />
+            <field name="model_id" ref="base.model_res_company"/>
             <field name="domain">[('user_ids', 'in', user.id),('logo', '!=', False)]</field>
-            <field name="action_id" eval="ref('base.action_res_company_form')" />
+            <field name="action_id" ref="base.action_res_company_form"/>
             <field name="res_id_field">user.company_id.id</field>
         </record>
 
@@ -275,9 +275,9 @@ Thank you,
             <field name="description">Create at least another user</field>
             <field name="display_mode">boolean</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="ref('base.model_res_users')" />
+            <field name="model_id" ref="base.model_res_users"/>
             <field name="domain">[('id', '!=', user.id)]</field>
-            <field name="action_id" eval="ref('action_new_simplified_res_users')" />
+            <field name="action_id" ref="action_new_simplified_res_users"/>
         </record>
 
         <!-- challenges -->
@@ -303,25 +303,25 @@ Thank you,
 
         <!-- lines -->
         <record model="gamification.challenge.line" id="line_base_discover1">
-            <field name="definition_id" eval="ref('definition_base_timezone')" />
+            <field name="definition_id" ref="definition_base_timezone"/>
             <field name="target_goal">1</field>
-            <field name="challenge_id" eval="ref('challenge_base_discover')" />
+            <field name="challenge_id" ref="challenge_base_discover"/>
         </record>
 
         <record model="gamification.challenge.line" id="line_base_admin2">
-            <field name="definition_id" eval="ref('definition_base_company_logo')" />
+            <field name="definition_id" ref="definition_base_company_logo"/>
             <field name="target_goal">1</field>
-            <field name="challenge_id" eval="ref('challenge_base_configure')" />
+            <field name="challenge_id" ref="challenge_base_configure"/>
         </record>
         <record model="gamification.challenge.line" id="line_base_admin1">
-            <field name="definition_id" eval="ref('definition_base_company_data')" />
+            <field name="definition_id" ref="definition_base_company_data"/>
             <field name="target_goal">0</field>
-            <field name="challenge_id" eval="ref('challenge_base_configure')" />
+            <field name="challenge_id" ref="challenge_base_configure"/>
         </record>
         <record model="gamification.challenge.line" id="line_base_admin3">
-            <field name="definition_id" eval="ref('definition_base_invite')" />
+            <field name="definition_id" ref="definition_base_invite"/>
             <field name="target_goal">1</field>
-            <field name="challenge_id" eval="ref('challenge_base_configure')" />
+            <field name="challenge_id" ref="challenge_base_configure"/>
         </record>
     </data>
 
diff --git a/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml b/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml
index 9b5c6cac959..93725e68ba3 100644
--- a/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml
+++ b/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <!-- goal definitions -->
         <record model="gamification.goal.definition" id="definition_crm_tot_invoices">
@@ -8,9 +7,9 @@
             <field name="description"></field>
             <field name="computation_mode">sum</field>
             <field name="monetary">True</field>
-            <field name="model_id" eval="ref('account.model_account_invoice_report')" />
-            <field name="field_id" eval="ref('account.field_account_invoice_report__price_subtotal')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_report__invoice_date')" />
+            <field name="model_id" ref="account.model_account_invoice_report"/>
+            <field name="field_id" ref="account.field_account_invoice_report__price_subtotal"/>
+            <field name="field_date_id" ref="account.field_account_invoice_report__invoice_date"/>
             <field name="domain">[('state','!=','cancel'),('invoice_user_id','=',user.id),('type','=','out_invoice')]</field>
         </record>
 
@@ -19,7 +18,7 @@
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
             <field name="suffix">leads</field>
-            <field name="model_id" eval="ref('crm.model_crm_lead')" />
+            <field name="model_id" ref="crm.model_crm_lead"/>
             <field name="field_date_id" search="[('model','=','crm.lead'),('name','=','create_date')]" />
             <!-- lead AND opportunity as don't want to be penalised for lead converted to opportunity -->
             <field name="domain">[('user_id','=',user.id), '|', ('type', '=', 'lead'), ('type', '=', 'opportunity')]</field>
@@ -31,9 +30,9 @@
             <field name="computation_mode">sum</field>
             <field name="condition">lower</field>
             <field name="suffix">days</field>
-            <field name="model_id" eval="ref('crm.model_crm_lead')" />
-            <field name="field_id" eval="ref('crm.field_crm_lead__day_close')" />
-            <field name="field_date_id" eval="ref('crm.field_crm_lead__date_closed')" />
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="field_id" ref="crm.field_crm_lead__day_close"/>
+            <field name="field_date_id" ref="crm.field_crm_lead__date_closed"/>
             <field name="domain">[('user_id','=',user.id),('type', '=', 'lead')]</field>
         </record>
 
@@ -43,9 +42,9 @@
             <field name="computation_mode">sum</field>
             <field name="condition">lower</field>
             <field name="suffix">days</field>
-            <field name="model_id" eval="ref('crm.model_crm_lead')" />
-            <field name="field_id" eval="ref('crm.field_crm_lead__day_open')" />
-            <field name="field_date_id" eval="ref('crm.field_crm_lead__date_open')" />
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="field_id" ref="crm.field_crm_lead__day_open"/>
+            <field name="field_date_id" ref="crm.field_crm_lead__date_open"/>
             <field name="domain">[('user_id','=',user.id)]</field>
         </record>
 
@@ -55,8 +54,8 @@
             <field name="description">Based on the opening date</field>
             <field name="computation_mode">count</field>
             <field name="suffix">opportunities</field>
-            <field name="model_id" eval="ref('crm.model_crm_lead')" />
-            <field name="field_date_id" eval="ref('crm.field_crm_lead__date_open')" />
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="field_date_id" ref="crm.field_crm_lead__date_open"/>
             <field name="domain">[('user_id','=',user.id),('type','=','opportunity')]</field>
         </record>
 
@@ -65,8 +64,8 @@
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
             <field name="suffix">orders</field>
-            <field name="model_id" eval="ref('sale.model_sale_order')" />
-            <field name="field_date_id" eval="ref('sale.field_sale_order__date_order')" />
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="field_date_id" ref="sale.field_sale_order__date_order"/>
             <field name="domain">[('user_id','=',user.id),('state','not in',('draft', 'sent', 'cancel'))]</field>
         </record>
 
@@ -75,8 +74,8 @@
             <field name="description">Based on the invoice date</field>
             <field name="computation_mode">count</field>
             <field name="suffix">orders</field>
-            <field name="model_id" eval="ref('account.model_account_invoice_report')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_report__invoice_date')" />
+            <field name="model_id" ref="account.model_account_invoice_report"/>
+            <field name="field_date_id" ref="account.field_account_invoice_report__invoice_date"/>
             <field name="domain">[('state','=','paid'),('invoice_user_id','=',user.id),('type','=','out_invoice')]</field>
         </record>
         <record model="gamification.goal.definition" id="definition_crm_tot_paid_sale_order">
@@ -84,9 +83,9 @@
             <field name="description">Based on the invoice date</field>
             <field name="computation_mode">count</field>
             <field name="monetary">True</field>
-            <field name="model_id" eval="ref('account.model_account_invoice_report')" />
-            <field name="field_id" eval="ref('account.field_account_invoice_report__price_subtotal')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_report__invoice_date')" />
+            <field name="model_id" ref="account.model_account_invoice_report"/>
+            <field name="field_id" ref="account.field_account_invoice_report__price_subtotal"/>
+            <field name="field_date_id" ref="account.field_account_invoice_report__invoice_date"/>
             <field name="domain">[('state','=','paid'),('invoice_user_id','=',user.id),('type','=','out_invoice')]</field>
         </record>
 
@@ -97,8 +96,8 @@
             <field name="computation_mode">count</field>
             <field name="condition">lower</field>
             <field name="suffix">invoices</field>
-            <field name="model_id" eval="ref('account.model_account_invoice_report')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_report__invoice_date')" />
+            <field name="model_id" ref="account.model_account_invoice_report"/>
+            <field name="field_date_id" ref="account.field_account_invoice_report__invoice_date"/>
             <field name="domain">[('state','!=','cancel'),('invoice_user_id','=',user.id),('type','=','out_refund')]</field>
         </record>
         <record model="gamification.goal.definition" id="definition_crm_tot_customer_refunds">
@@ -107,9 +106,9 @@
             <field name="computation_mode">sum</field>
             <field name="condition">higher</field>
             <field name="monetary">True</field>
-            <field name="model_id" eval="ref('account.model_account_invoice_report')" />
-            <field name="field_id" eval="ref('account.field_account_invoice_report__price_subtotal')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_report__invoice_date')" />
+            <field name="model_id" ref="account.model_account_invoice_report"/>
+            <field name="field_id" ref="account.field_account_invoice_report__price_subtotal"/>
+            <field name="field_date_id" ref="account.field_account_invoice_report__invoice_date"/>
             <field name="domain">[('state','!=','cancel'),('invoice_user_id','=',user.id),('type','=','out_refund')]</field>
         </record>
 
@@ -134,30 +133,29 @@
 
          <!-- lines -->
         <record model="gamification.challenge.line" id="line_crm_sale1">
-            <field name="definition_id" eval="ref('definition_crm_tot_invoices')" />
+            <field name="definition_id" ref="definition_crm_tot_invoices"/>
             <field name="target_goal">20000</field>
-            <field name="challenge_id" eval="ref('challenge_crm_sale')" />
+            <field name="challenge_id" ref="challenge_crm_sale"/>
         </record>
 
 
         <record model="gamification.challenge.line" id="line_crm_marketing1">
-            <field name="definition_id" eval="ref('definition_crm_nbr_new_leads')" />
+            <field name="definition_id" ref="definition_crm_nbr_new_leads"/>
             <field name="target_goal">7</field>
-            <field name="challenge_id" eval="ref('challenge_crm_marketing')" />
+            <field name="challenge_id" ref="challenge_crm_marketing"/>
             <field name="sequence">1</field>
         </record>
         <record model="gamification.challenge.line" id="line_crm_marketing2">
-            <field name="definition_id" eval="ref('definition_crm_lead_delay_open')" />
+            <field name="definition_id" ref="definition_crm_lead_delay_open"/>
             <field name="target_goal">15</field>
-            <field name="challenge_id" eval="ref('challenge_crm_marketing')" />
+            <field name="challenge_id" ref="challenge_crm_marketing"/>
             <field name="sequence">2</field>
         </record>
         <record model="gamification.challenge.line" id="line_crm_marketing3">
-            <field name="definition_id" eval="ref('definition_crm_nbr_new_opportunities')" />
+            <field name="definition_id" ref="definition_crm_nbr_new_opportunities"/>
             <field name="target_goal">5</field>
-            <field name="challenge_id" eval="ref('challenge_crm_marketing')" />
+            <field name="challenge_id" ref="challenge_crm_marketing"/>
             <field name="sequence">3</field>
         </record>
 
-    </data>
 </odoo>
diff --git a/addons/hr_contract/data/hr_contract_data.xml b/addons/hr_contract/data/hr_contract_data.xml
index 546b36def1b..2bd98cb17e1 100644
--- a/addons/hr_contract/data/hr_contract_data.xml
+++ b/addons/hr_contract/data/hr_contract_data.xml
@@ -20,7 +20,7 @@
             <field name="name">Contract to Renew</field>
             <field name="res_model">hr.department</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_contract_pending')"/>
+            <field name="parent_id" ref="mt_contract_pending"/>
             <field name="relation_field">department_id</field>
             <field name="description">Contract about to expire</field>
         </record>
diff --git a/addons/hr_expense/data/hr_expense_demo.xml b/addons/hr_expense/data/hr_expense_demo.xml
index 969cc271e92..8444b0aa957 100644
--- a/addons/hr_expense/data/hr_expense_demo.xml
+++ b/addons/hr_expense/data/hr_expense_demo.xml
@@ -16,7 +16,7 @@
 
         <record id="res_partner_address_fp" model="res.partner">
             <field name="name">Pieter Parter's Farm</field>
-            <field name="parent_id" eval="ref('base.partner_root')"/>
+            <field name="parent_id" ref="base.partner_root"/>
             <field name="street">Chaussée de Namur, 40</field>
             <field name="zip">1367</field>
             <field name="city">Grand-Rosière-Hottomont</field>
diff --git a/addons/hr_holidays/data/hr_holidays_data.xml b/addons/hr_holidays/data/hr_holidays_data.xml
index ca89cd2ef43..94c2bb017b3 100644
--- a/addons/hr_holidays/data/hr_holidays_data.xml
+++ b/addons/hr_holidays/data/hr_holidays_data.xml
@@ -8,8 +8,8 @@
             <field name="leave_validation_type">both</field>
             <field name="allocation_validation_type">both</field>
             <field name="color_name">black</field>
-            <field name="leave_notif_subtype_id" eval="ref('mt_leave')"/>
-            <field name="allocation_notif_subtype_id" eval="ref('mt_leave_allocation')"/>
+            <field name="leave_notif_subtype_id" ref="mt_leave"/>
+            <field name="allocation_notif_subtype_id" ref="mt_leave_allocation"/>
             <field name="validity_start" eval="time.strftime('%Y-%m-01')"/>
             <field name="responsible_id" ref="base.user_admin"/>
         </record>
@@ -20,7 +20,7 @@
             <field name="allocation_type">no</field>
             <field name="color_name">red</field>
             <field name="validity_start" eval="time.strftime('%Y-01-01')"/>
-            <field name="leave_notif_subtype_id" eval="ref('mt_leave_sick')"/>
+            <field name="leave_notif_subtype_id" ref="mt_leave_sick"/>
             <field name="responsible_id" ref="base.user_admin"/>
         </record>
 
@@ -33,7 +33,7 @@
             <field name="request_unit">hour</field>
             <field name="color_name">lavender</field>
             <field name="validity_start" eval="False"/>
-            <field name="leave_notif_subtype_id" eval="ref('mt_leave')"/>
+            <field name="leave_notif_subtype_id" ref="mt_leave"/>
             <field name="responsible_id" ref="base.user_admin"/>
         </record>
 
@@ -47,7 +47,7 @@
             <field name="request_unit">hour</field>
             <field name="unpaid" eval="True"/>
             <field name="validity_start" eval="time.strftime('%Y-01-01')"/>
-            <field name="leave_notif_subtype_id" eval="ref('mt_leave_unpaid')"/>
+            <field name="leave_notif_subtype_id" ref="mt_leave_unpaid"/>
             <field name="responsible_id" ref="base.user_admin"/>
         </record>
     </data>
diff --git a/addons/hr_recruitment/data/hr_recruitment_data.xml b/addons/hr_recruitment/data/hr_recruitment_data.xml
index 1bfcfc3cd11..5c233c356a7 100644
--- a/addons/hr_recruitment/data/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/data/hr_recruitment_data.xml
@@ -322,14 +322,14 @@
         <field name="name">Applicant Stage Changed</field>
         <field name="res_model">hr.job</field>
         <field name="default" eval="False"/>
-        <field name="parent_id" eval="ref('mt_applicant_stage_changed')"/>
+        <field name="parent_id" ref="mt_applicant_stage_changed"/>
         <field name="relation_field">job_id</field>
     </record>
     <record id="mt_job_applicant_hired" model="mail.message.subtype">
         <field name="name">Applicant Hired</field>
         <field name="res_model">hr.job</field>
         <field name="default" eval="True"/>
-        <field name="parent_id" eval="ref('mt_applicant_hired')"/>
+        <field name="parent_id" ref="mt_applicant_hired"/>
         <field name="relation_field">job_id</field>
     </record>
 
@@ -338,7 +338,7 @@
         <field name="name">Job Position Created</field>
         <field name="res_model">hr.department</field>
         <field name="sequence" eval="1"/>
-        <field name="parent_id" eval="ref('mt_job_new')"/>
+        <field name="parent_id" ref="mt_job_new"/>
         <field name="relation_field">department_id</field>
     </record>
 
diff --git a/addons/maintenance/data/mail_data.xml b/addons/maintenance/data/mail_data.xml
index 4879b198571..641aa3d7a68 100644
--- a/addons/maintenance/data/mail_data.xml
+++ b/addons/maintenance/data/mail_data.xml
@@ -42,14 +42,14 @@
         <field name="name">Maintenance Request Created</field>
         <field name="res_model">maintenance.equipment.category</field>
         <field name="default" eval="True"/>
-        <field name="parent_id" eval="ref('mt_req_created')"/>
+        <field name="parent_id" ref="mt_req_created"/>
         <field name="relation_field">category_id</field>
     </record>
     <record id="mt_cat_mat_assign" model="mail.message.subtype">
         <field name="name">Equipment Assigned</field>
         <field name="res_model">maintenance.equipment.category</field>
         <field name="default" eval="True"/>
-        <field name="parent_id" eval="ref('mt_mat_assign')"/>
+        <field name="parent_id" ref="mt_mat_assign"/>
         <field name="relation_field">category_id</field>
     </record>
     <record id="equipment_team_maintenance" model="maintenance.team">
diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index e2768d2ae16..802a1ec6b4c 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -40,8 +40,8 @@
 
         <!-- Create Opt-out Records -->
         <record id="mass_mail_contact_list_rel_1" model="mailing.contact.subscription">
-            <field name="list_id" eval="ref('mass_mailing.mass_mail_list_2')"/>
-            <field name="contact_id" eval="ref('mass_mailing.mass_mail_contact_4')"/>
+            <field name="list_id" ref="mass_mailing.mass_mail_list_2"/>
+            <field name="contact_id" ref="mass_mailing.mass_mail_contact_4"/>
             <field name="opt_out">True</field>
         </record>
 
@@ -57,7 +57,7 @@
         <record id="mass_mail_campaign_1" model="utm.campaign">
             <field name="name">Newsletter</field>
             <field name="stage_id" ref="utm.campaign_stage_1"/>
-            <field name="user_id" eval="ref('base.user_admin')"/>
+            <field name="user_id" ref="base.user_admin"/>
             <field name="tag_ids" eval="[(6,0,[ref('utm.utm_tag_1')])]"/>
         </record>
 
@@ -65,10 +65,10 @@
             <field name="name">Newsletter 1</field>
             <field name="subject" eval="'%s Newsletter' % (DateTime.today().strftime('%B'))"/>
             <field name="state">done</field>
-            <field name="user_id" eval="ref('base.user_admin')"/>
+            <field name="user_id" ref="base.user_admin"/>
             <field name="email_from">info@yourcompany.example.com</field>
             <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="campaign_id" eval="ref('mass_mail_campaign_1')"/>
+            <field name="campaign_id" ref="mass_mail_campaign_1"/>
             <field name="source_id" ref="mass_mailing.utm_source_0"/>
             <field name="mailing_model_id" ref="base.model_res_partner"/>
             <field name="mailing_domain" eval="[('parent_id', '=', ref('base.res_partner_4'))]"/>
@@ -132,7 +132,6 @@
                                     <tr>
                                         <td class="o_mail_footer_links o_default_snippet_text" style="padding:10px 0 10px 0;text-align:center;vertical-align:middle;">
                                             <a href="/unsubscribe_from_list" class="btn btn-link o_default_snippet_text" style="text-decoration:none;border-radius:0.25rem;border-style:solid;padding:0px;cursor:pointer;line-height:1.5;font-size:12px;border-left-color:transparent;border-bottom-color:transparent;border-right-color:transparent;border-top-color:transparent;border-left-width:1px;border-bottom-width:1px;border-right-width:1px;border-top-width:1px;user-select:none;vertical-align:middle;white-space:nowrap;text-align:center;font-weight:bold;display:inline-block;background-color:transparent;color:rgb(100, 89, 116);">Unsubscribe</a> | 
-                                            
                                             <a href="/contactus" class="btn btn-link o_default_snippet_text" style="text-decoration:none;border-radius:0.25rem;border-style:solid;padding:0px;cursor:pointer;line-height:1.5;font-size:12px;border-left-color:transparent;border-bottom-color:transparent;border-right-color:transparent;border-top-color:transparent;border-left-width:1px;border-bottom-width:1px;border-right-width:1px;border-top-width:1px;user-select:none;vertical-align:middle;white-space:nowrap;text-align:center;font-weight:bold;display:inline-block;background-color:transparent;color:rgb(100, 89, 116);">Contact</a>
                                         </td>
                                     </tr>
@@ -168,7 +167,7 @@
         <function model="mailing.mailing" name="convert_links" eval="[ref('mass_mailing.mass_mail_1')]"/>
 
         <record id="mass_mail_1_stat_0" model="mailing.trace">
-            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
             <field name="message_id">1111000@odoo.com</field>
             <field name="model">res.partner</field>
             <field name="res_id" ref="base.res_partner_address_7"/>
@@ -178,7 +177,7 @@
             <field name="replied" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
         </record>
         <record id="mass_mail_1_stat_1" model="mailing.trace">
-            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
             <field name="message_id">1111001@odoo.com</field>
             <field name="model">res.partner</field>
             <field name="res_id" ref="base.res_partner_address_13"/>
@@ -188,7 +187,7 @@
             <field name="replied" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M:%S')"/>
         </record>
         <record id="mass_mail_1_stat_2" model="mailing.trace">
-            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
             <field name="message_id">1111002@odoo.com</field>
             <field name="model">res.partner</field>
             <field name="res_id" ref="base.res_partner_address_14"/>
@@ -197,7 +196,7 @@
             <field name="opened" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
         </record>
         <record id="mass_mail_1_stat_3" model="mailing.trace">
-            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
             <field name="message_id">1111003@odoo.com</field>
             <field name="model">res.partner</field>
             <field name="res_id" ref="base.res_partner_address_24"/>
@@ -206,7 +205,7 @@
             <field name="opened" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
         </record>
         <record id="mass_mail_1_stat_4" model="mailing.trace">
-            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
             <field name="message_id">1111004@odoo.com</field>
             <field name="model">res.partner</field>
             <field name="res_id" ref="base.res_partner_address_32"/>
@@ -214,7 +213,7 @@
             <field name="sent" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
         </record>
         <record id="mass_mail_1_stat_5" model="mailing.trace">
-            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
             <field name="message_id">1111004@odoo.com</field>
             <field name="model">res.partner</field>
             <field name="res_id" ref="base.res_partner_address_33"/>
@@ -223,7 +222,7 @@
             <field name="exception" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
         </record>
         <record id="mass_mail_1_stat_6" model="mailing.trace">
-            <field name="mass_mailing_id" eval="ref('mass_mail_1')"/>
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
             <field name="message_id">1111004@odoo.com</field>
             <field name="model">res.partner</field>
             <field name="res_id" ref="base.res_partner_address_34"/>
diff --git a/addons/mass_mailing_crm/data/mass_mailing_demo.xml b/addons/mass_mailing_crm/data/mass_mailing_demo.xml
index 1aaa7521084..41dcaf2d0eb 100644
--- a/addons/mass_mailing_crm/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing_crm/data/mass_mailing_demo.xml
@@ -7,7 +7,7 @@
         <field name="state">in_queue</field>
         <field name="user_id" ref="base.user_admin"/>
         <field name="schedule_date" eval="(DateTime.today() + relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        <field name="campaign_id" eval="ref('mass_mailing.mass_mail_campaign_1')"/>
+        <field name="campaign_id" ref="mass_mailing.mass_mail_campaign_1"/>
         <field name="source_id" ref="utm.utm_source_mailing"/>
         <field name="mailing_model_id" ref="crm.model_crm_lead"/>
         <field name="mailing_domain">[]</field>
diff --git a/addons/mass_mailing_sale/data/mass_mailing_demo.xml b/addons/mass_mailing_sale/data/mass_mailing_demo.xml
index 6b2b543e790..c1872022fa3 100644
--- a/addons/mass_mailing_sale/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing_sale/data/mass_mailing_demo.xml
@@ -7,7 +7,7 @@
         <field name="state">in_queue</field>
         <field name="user_id" ref="base.user_admin"/>
         <field name="schedule_date" eval="(DateTime.today() + relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        <field name="campaign_id" eval="ref('mass_mailing.mass_mail_campaign_1')"/>
+        <field name="campaign_id" ref="mass_mailing.mass_mail_campaign_1"/>
         <field name="source_id" ref="sale.utm_source_sale_order_0"/>
         <field name="mailing_model_id" ref="sale.model_sale_order"/>
         <field name="mailing_domain">[]</field>
diff --git a/addons/note/data/note_data.xml b/addons/note/data/note_data.xml
index b4d2518f0c9..1843cfb915d 100644
--- a/addons/note/data/note_data.xml
+++ b/addons/note/data/note_data.xml
@@ -4,25 +4,25 @@
     <record model="note.stage" id="note_stage_00">
         <field name="name">New</field>
         <field name="sequence">0</field>
-        <field name="user_id" eval="ref('base.user_admin')"/>
+        <field name="user_id" ref="base.user_admin"/>
     </record>
 
     <record model="note.stage" id="note_stage_01">
         <field name="name">Meeting Minutes</field>
         <field name="sequence">5</field>
-        <field name="user_id" eval="ref('base.user_admin')"/>
+        <field name="user_id" ref="base.user_admin"/>
     </record>
 
     <record model="note.stage" id="note_stage_02">
         <field name="name">Notes</field>
         <field name="sequence">10</field>
-        <field name="user_id" eval="ref('base.user_admin')"/>
+        <field name="user_id" ref="base.user_admin"/>
     </record>
 
     <record model="note.stage" id="note_stage_03">
         <field name="name">Todo</field>
         <field name="sequence">50</field>
-        <field name="user_id" eval="ref('base.user_admin')"/>
+        <field name="user_id" ref="base.user_admin"/>
     </record>
     </data>
 </odoo>
diff --git a/addons/pos_restaurant/data/pos_restaurant_demo.xml b/addons/pos_restaurant/data/pos_restaurant_demo.xml
index 8f8c2d463b1..01eea53c90b 100644
--- a/addons/pos_restaurant/data/pos_restaurant_demo.xml
+++ b/addons/pos_restaurant/data/pos_restaurant_demo.xml
@@ -211,12 +211,12 @@
         <record id="floor_main" model="restaurant.floor">
             <field name="name">Main Floor</field>
             <field name="background_color">rgb(136,137,242)</field>
-            <field name="pos_config_id" eval="ref('pos_restaurant.pos_config_restaurant')" />
+            <field name="pos_config_id" ref="pos_restaurant.pos_config_restaurant"/>
         </record>
 
         <record id="table_01" model="restaurant.table">
             <field name="name">T1</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_main')" />
+            <field name="floor_id" ref="pos_restaurant.floor_main"/>
             <field name="seats">4</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -228,7 +228,7 @@
 
         <record id="table_02" model="restaurant.table">
             <field name="name">T2</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_main')" />
+            <field name="floor_id" ref="pos_restaurant.floor_main"/>
             <field name="seats">4</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -240,7 +240,7 @@
 
         <record id="table_03" model="restaurant.table">
             <field name="name">T3</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_main')" />
+            <field name="floor_id" ref="pos_restaurant.floor_main"/>
             <field name="seats">4</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -252,7 +252,7 @@
 
         <record id="table_04" model="restaurant.table">
             <field name="name">T4</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_main')" />
+            <field name="floor_id" ref="pos_restaurant.floor_main"/>
             <field name="seats">4</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -264,7 +264,7 @@
 
         <record id="table_05" model="restaurant.table">
             <field name="name">T5</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_main')" />
+            <field name="floor_id" ref="pos_restaurant.floor_main"/>
             <field name="seats">4</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -276,7 +276,7 @@
 
         <record id="table_06" model="restaurant.table">
             <field name="name">T6</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_main')" />
+            <field name="floor_id" ref="pos_restaurant.floor_main"/>
             <field name="seats">4</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -288,7 +288,7 @@
 
         <record id="table_07" model="restaurant.table">
             <field name="name">T7</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_main')" />
+            <field name="floor_id" ref="pos_restaurant.floor_main"/>
             <field name="seats">4</field>
             <field name="color">rgb(235,109,109)</field>
             <field name="shape">square</field>
@@ -300,7 +300,7 @@
 
         <record id="table_08" model="restaurant.table">
             <field name="name">T8</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_main')" />
+            <field name="floor_id" ref="pos_restaurant.floor_main"/>
             <field name="seats">4</field>
             <field name="color">rgb(235,109,109)</field>
             <field name="shape">square</field>
@@ -312,7 +312,7 @@
 
         <record id="table_09" model="restaurant.table">
             <field name="name">T9</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_main')" />
+            <field name="floor_id" ref="pos_restaurant.floor_main"/>
             <field name="seats">4</field>
             <field name="color">rgb(235,109,109)</field>
             <field name="shape">square</field>
@@ -324,7 +324,7 @@
 
         <record id="table_10" model="restaurant.table">
             <field name="name">T10</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_main')" />
+            <field name="floor_id" ref="pos_restaurant.floor_main"/>
             <field name="seats">4</field>
             <field name="color">rgb(235,109,109)</field>
             <field name="shape">square</field>
@@ -336,7 +336,7 @@
 
         <record id="table_11" model="restaurant.table">
             <field name="name">T11</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_main')" />
+            <field name="floor_id" ref="pos_restaurant.floor_main"/>
             <field name="seats">4</field>
             <field name="color">rgb(78,210,190)</field>
             <field name="shape">round</field>
@@ -351,14 +351,14 @@
         <record id="floor_patio" model="restaurant.floor">
             <field name="name">Patio</field>
             <field name="background_color">rgb(130, 233, 171)</field>
-            <field name="pos_config_id" eval="ref('pos_restaurant.pos_config_restaurant')" />
+            <field name="pos_config_id" ref="pos_restaurant.pos_config_restaurant"/>
         </record>
 
         <!-- Patio: Left table row -->
 
         <record id="table_21" model="restaurant.table">
             <field name="name">T1</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">2</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -370,7 +370,7 @@
 
         <record id="table_22" model="restaurant.table">
             <field name="name">T2</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">2</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -382,7 +382,7 @@
 
         <record id="table_23" model="restaurant.table">
             <field name="name">T3</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">2</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -394,7 +394,7 @@
 
         <record id="table_24" model="restaurant.table">
             <field name="name">T4</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">2</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -408,7 +408,7 @@
 
         <record id="table_25" model="restaurant.table">
             <field name="name">T5</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">2</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -420,7 +420,7 @@
 
         <record id="table_26" model="restaurant.table">
             <field name="name">T6</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">2</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -432,7 +432,7 @@
 
         <record id="table_27" model="restaurant.table">
             <field name="name">T7</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">2</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -444,7 +444,7 @@
 
         <record id="table_28" model="restaurant.table">
             <field name="name">T8</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">2</field>
             <field name="color">rgb(53,211,116)</field>
             <field name="shape">square</field>
@@ -458,7 +458,7 @@
 
         <record id="table_29" model="restaurant.table">
             <field name="name">T9</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">4</field>
             <field name="color">rgb(235,191,109)</field>
             <field name="shape">square</field>
@@ -470,7 +470,7 @@
 
         <record id="table_29" model="restaurant.table">
             <field name="name">T9</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">4</field>
             <field name="color">rgb(235,191,109)</field>
             <field name="shape">square</field>
@@ -482,7 +482,7 @@
 
         <record id="table_30" model="restaurant.table">
             <field name="name">T10</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">4</field>
             <field name="color">rgb(235,191,109)</field>
             <field name="shape">square</field>
@@ -494,7 +494,7 @@
 
         <record id="table_31" model="restaurant.table">
             <field name="name">T11</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">4</field>
             <field name="color">rgb(235,191,109)</field>
             <field name="shape">square</field>
@@ -506,7 +506,7 @@
 
         <record id="table_32" model="restaurant.table">
             <field name="name">T12</field>
-            <field name="floor_id" eval="ref('pos_restaurant.floor_patio')" />
+            <field name="floor_id" ref="pos_restaurant.floor_patio"/>
             <field name="seats">4</field>
             <field name="color">rgb(235,191,109)</field>
             <field name="shape">square</field>
diff --git a/addons/project/data/project_data.xml b/addons/project/data/project_data.xml
index f0b29fdfa99..b2b6d043752 100644
--- a/addons/project/data/project_data.xml
+++ b/addons/project/data/project_data.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="ir_cron_rating_project" model="ir.cron">
             <field name="name">Project: Send rating</field>
@@ -49,7 +48,7 @@
             <field name="sequence">10</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_task_new')"/>
+            <field name="parent_id" ref="mt_task_new"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_blocked" model="mail.message.subtype">
@@ -57,7 +56,7 @@
             <field name="sequence">11</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_task_blocked')"/>
+            <field name="parent_id" ref="mt_task_blocked"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_ready" model="mail.message.subtype">
@@ -65,7 +64,7 @@
             <field name="sequence">12</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_task_ready')"/>
+            <field name="parent_id" ref="mt_task_ready"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_stage" model="mail.message.subtype">
@@ -73,7 +72,7 @@
             <field name="sequence">13</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_task_stage')"/>
+            <field name="parent_id" ref="mt_task_stage"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_rating" model="mail.message.subtype">
@@ -81,12 +80,9 @@
             <field name="sequence">14</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="True"/>
-            <field name="parent_id" eval="ref('mt_task_rating')"/>
+            <field name="parent_id" ref="mt_task_rating"/>
             <field name="relation_field">project_id</field>
         </record>
-    </data>
-
-    <data noupdate="1">
 
         <record forcecreate="False" id="project_project_data" model="project.project">
             <field name="name">Start here to discover Odoo</field>
@@ -265,5 +261,4 @@
             <field name="description">In the chatter, sending an email with an attachment will display the picture on the card. When there are several image attachments, you can choose which one you want to display.</field>
         </record>
 
-    </data>
 </odoo>
diff --git a/addons/sale/data/mail_data.xml b/addons/sale/data/mail_data.xml
index 1176f677c19..0b66f309e04 100644
--- a/addons/sale/data/mail_data.xml
+++ b/addons/sale/data/mail_data.xml
@@ -28,7 +28,7 @@
             <field name="sequence">20</field>
             <field name="res_model">crm.team</field>
             <field name="default" eval="True"/>
-            <field name="parent_id" eval="ref('sale.mt_order_sent')"/>
+            <field name="parent_id" ref="sale.mt_order_sent"/>
             <field name="relation_field">team_id</field>
         </record>
         <record id="mt_salesteam_order_confirmed" model="mail.message.subtype">
@@ -36,21 +36,21 @@
             <field name="sequence">21</field>
             <field name="res_model">crm.team</field>
             <field name="default" eval="True"/>
-            <field name="parent_id" eval="ref('sale.mt_order_confirmed')"/>
+            <field name="parent_id" ref="sale.mt_order_confirmed"/>
             <field name="relation_field">team_id</field>
         </record>
         <record id="mt_salesteam_invoice_created" model="mail.message.subtype">
             <field name="name">Invoice Created</field>
             <field name="sequence">22</field>
             <field name="res_model">crm.team</field>
-            <field name="parent_id" eval="ref('account.mt_invoice_created')"/>
+            <field name="parent_id" ref="account.mt_invoice_created"/>
             <field name="relation_field">team_id</field>
         </record>
         <record id="mt_salesteam_invoice_confirmed" model="mail.message.subtype">
             <field name="name">Invoice Confirmed</field>
             <field name="sequence">23</field>
             <field name="res_model">crm.team</field>
-            <field name="parent_id" eval="ref('account.mt_invoice_validated')"/>
+            <field name="parent_id" ref="account.mt_invoice_validated"/>
             <field name="relation_field">team_id</field>
         </record>
     </data>
diff --git a/addons/test_mail/data/subtype_data.xml b/addons/test_mail/data/subtype_data.xml
index 076f4cbbf9b..f97e60e72f7 100644
--- a/addons/test_mail/data/subtype_data.xml
+++ b/addons/test_mail/data/subtype_data.xml
@@ -27,7 +27,7 @@
     <record id="st_mail_test_child_full" model="mail.message.subtype">
         <field name="name">Umbrella Child Full Subtype</field>
         <field name="res_model">mail.test</field>
-        <field name="parent_id" eval="ref('test_mail.st_mail_test_full_umbrella_upd')"/>
+        <field name="parent_id" ref="test_mail.st_mail_test_full_umbrella_upd"/>
         <field name="relation_field">umbrella_id</field>
         <field name="default" eval="False"/>
         <field name="internal" eval="False"/>
diff --git a/addons/website_crm_partner_assign/data/res_partner_demo.xml b/addons/website_crm_partner_assign/data/res_partner_demo.xml
index bcd499ba4a8..dde9e124af6 100644
--- a/addons/website_crm_partner_assign/data/res_partner_demo.xml
+++ b/addons/website_crm_partner_assign/data/res_partner_demo.xml
@@ -22,7 +22,7 @@
             <field name="partner_weight">10</field>
         </record>
         <record model="res.partner" id="base.res_partner_2">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_3')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_3"/>
         </record>
        <record id="base.res_partner_4" model="res.partner">
             <field name="grade_id" ref="res_partner_grade_bronze"/>
@@ -69,39 +69,39 @@
         </record>
 
         <record model="res.partner" id="base.res_partner_10">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_4')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_4"/>
         </record>
         <record model="res.partner" id="base.res_partner_12">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_10')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_10"/>
         </record>
         <record model="res.partner" id="base.res_partner_4">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_4')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_4"/>
         </record>
         <record model="res.partner" id="base.res_partner_10">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_12')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_12"/>
         </record>
         <record model="res.partner" id="base.res_partner_3">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_3')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_3"/>
         </record>
         <record model="res.partner" id="base.res_partner_2">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_1')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_1"/>
         </record>
         <record model="res.partner" id="base.res_partner_4">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_18')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_18"/>
         </record>
         <record model="res.partner" id="base.res_partner_4">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_3')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_3"/>
         </record>
         <record model="res.partner" id="base.res_partner_1">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_12')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_12"/>
         </record>
         <record model="res.partner" id="base.res_partner_1">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_2')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_2"/>
         </record>
         <record model="res.partner" id="base.res_partner_1">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_2')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_2"/>
         </record>
         <record model="res.partner" id="base.res_partner_12">
-            <field name="assigned_partner_id" eval="ref('base.res_partner_12')"/>
+            <field name="assigned_partner_id" ref="base.res_partner_12"/>
         </record>
 </odoo>
diff --git a/addons/website_forum/data/badges_answer.xml b/addons/website_forum/data/badges_answer.xml
index 712a717c457..30e1887d983 100644
--- a/addons/website_forum/data/badges_answer.xml
+++ b/addons/website_forum/data/badges_answer.xml
@@ -15,11 +15,11 @@
             <field name="description">Received at least 3 upvote for an answer for the first time</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 3)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_teacher">
@@ -27,15 +27,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_a_1')" />
+            <field name="reward_id" ref="badge_a_1"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_teacher">
-            <field name="definition_id" eval="ref('definition_teacher')"/>
-            <field name="challenge_id" eval="ref('challenge_teacher')"/>
+            <field name="definition_id" ref="definition_teacher"/>
+            <field name="challenge_id" ref="challenge_teacher"/>
             <field name="target_goal">1</field>
         </record>
         <!-- Nice: at least 4 upvotes -->
@@ -50,11 +50,11 @@
             <field name="description">Answer voted up 4 times</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 4)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_nice_answer">
@@ -62,15 +62,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_a_2')" />
+            <field name="reward_id" ref="badge_a_2"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_nice_answer">
-            <field name="definition_id" eval="ref('definition_nice_answer')"/>
-            <field name="challenge_id" eval="ref('challenge_nice_answer')"/>
+            <field name="definition_id" ref="definition_nice_answer"/>
+            <field name="challenge_id" ref="challenge_nice_answer"/>
             <field name="target_goal">1</field>
         </record>
         <!-- Good: at least 6 upvotes -->
@@ -85,11 +85,11 @@
             <field name="description">Answer voted up 6 times</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 6)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_good_answer">
@@ -97,15 +97,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_a_3')" />
+            <field name="reward_id" ref="badge_a_3"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_good_answer">
-            <field name="definition_id" eval="ref('definition_good_answer')"/>
-            <field name="challenge_id" eval="ref('challenge_good_answer')"/>
+            <field name="definition_id" ref="definition_good_answer"/>
+            <field name="challenge_id" ref="challenge_good_answer"/>
             <field name="target_goal">1</field>
         </record>
         <!-- Great: at least 15 upvotes -->
@@ -120,11 +120,11 @@
             <field name="description">Answer voted up 15 times</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 15)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_great_answer">
@@ -132,15 +132,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_a_4')" />
+            <field name="reward_id" ref="badge_a_4"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_great_answer">
-            <field name="definition_id" eval="ref('definition_great_answer')"/>
-            <field name="challenge_id" eval="ref('challenge_great_answer')"/>
+            <field name="definition_id" ref="definition_great_answer"/>
+            <field name="challenge_id" ref="challenge_great_answer"/>
             <field name="target_goal">1</field>
         </record>
 
@@ -157,11 +157,11 @@
             <field name="description">Answer was accepted with 3 or more votes</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')"/>
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 3), ('is_correct', '=', True)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_enlightened">
@@ -169,15 +169,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_a_5')" />
+            <field name="reward_id" ref="badge_a_5"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_enlightened">
-            <field name="definition_id" eval="ref('definition_enlightened')"/>
-            <field name="challenge_id" eval="ref('challenge_enlightened')"/>
+            <field name="definition_id" ref="definition_enlightened"/>
+            <field name="challenge_id" ref="challenge_enlightened"/>
             <field name="target_goal">1</field>
         </record>
         <!-- Guru: at least 15 upvotes for an accepted answer -->
@@ -192,11 +192,11 @@
             <field name="description">Answer accepted with 15 or more votes</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 15), ('is_correct', '=', True)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_guru">
@@ -204,16 +204,16 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_a_6')" />
+            <field name="reward_id" ref="badge_a_6"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_guru">
-            <field name="definition_id" eval="ref('definition_guru')" />
+            <field name="definition_id" ref="definition_guru"/>
             <field name="target_goal">1</field>
-            <field name="challenge_id" eval="ref('challenge_guru')" />
+            <field name="challenge_id" ref="challenge_guru"/>
         </record>
 
         <!-- Sealf Leaner: own question, 3+ upvotes -->
@@ -228,28 +228,28 @@
             <field name="description">Answer own question with at least 4 up votes</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="condition">higher</field>
             <field name="domain">[('self_reply', '=', True), ('vote_count', '>=', 4)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
-            <field name="batch_user_expression">user.id</field>            
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
+            <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_self_learner">
             <field name="name">Self-Learner</field>
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_a_8')" />
+            <field name="reward_id" ref="badge_a_8"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_self_learner">
-            <field name="definition_id" eval="ref('definition_self_learner')"/>
+            <field name="definition_id" ref="definition_self_learner"/>
             <field name="target_goal">1</field>
-            <field name="challenge_id" eval="ref('challenge_self_learner')"/>
+            <field name="challenge_id" ref="challenge_self_learner"/>
         </record>
 
     </data>
diff --git a/addons/website_forum/data/badges_moderation.xml b/addons/website_forum/data/badges_moderation.xml
index 65dae67a4a3..339029bf400 100644
--- a/addons/website_forum/data/badges_moderation.xml
+++ b/addons/website_forum/data/badges_moderation.xml
@@ -22,11 +22,11 @@
             <field name="description">First downvote</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post_vote')"/>
+            <field name="model_id" ref="website_forum.model_forum_post_vote"/>
             <field name="condition">higher</field>
             <field name="domain">[('vote', '=', '-1')]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_vote__user_id')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post_vote__user_id"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_critic">
@@ -34,15 +34,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_5')" />
+            <field name="reward_id" ref="badge_5"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_critic">
-            <field name="definition_id" eval="ref('definition_critic')"/>
-            <field name="challenge_id" eval="ref('challenge_critic')"/>
+            <field name="definition_id" ref="definition_critic"/>
+            <field name="challenge_id" ref="challenge_critic"/>
             <field name="target_goal">1</field>
         </record>
 
@@ -58,11 +58,11 @@
             <field name="description">Delete own post with 3 or more upvotes</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="condition">higher</field>
             <field name="domain">[('vote_count', '>=', 3), ('active', '=', False)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_disciplined">
@@ -70,15 +70,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_6')" />
+            <field name="reward_id" ref="badge_6"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_disciplined">
-            <field name="definition_id" eval="ref('definition_disciplined')"/>
-            <field name="challenge_id" eval="ref('challenge_disciplined')"/>
+            <field name="definition_id" ref="definition_disciplined"/>
+            <field name="challenge_id" ref="challenge_disciplined"/>
             <field name="target_goal">1</field>
         </record>
 
@@ -94,11 +94,11 @@
             <field name="description">First edit of answer or question</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('mail.model_mail_message')" />
+            <field name="model_id" ref="mail.model_mail_message"/>
             <field name="condition">higher</field>
             <field name="domain" eval="[('model', '=', 'forum.post'), ('subtype_id', 'in', [ref('website_forum.mt_answer_edit'), ref('website_forum.mt_question_edit')])]"/>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('mail.field_mail_message__author_id')" />
+            <field name="batch_distinctive_field" ref="mail.field_mail_message__author_id"/>
             <field name="batch_user_expression">user.partner_id.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_editor">
@@ -106,15 +106,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_7')" />
+            <field name="reward_id" ref="badge_7"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_editor">
-            <field name="definition_id" eval="ref('definition_editor')"/>
-            <field name="challenge_id" eval="ref('challenge_editor')"/>
+            <field name="definition_id" ref="definition_editor"/>
+            <field name="challenge_id" ref="challenge_editor"/>
             <field name="target_goal">1</field>
         </record>
 
@@ -129,11 +129,11 @@
             <field name="description">First upvote</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post_vote')" />
+            <field name="model_id" ref="website_forum.model_forum_post_vote"/>
             <field name="condition">higher</field>
             <field name="domain">[('vote', '=', '1')]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_vote__user_id')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post_vote__user_id"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_supporter">
@@ -141,16 +141,16 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_31')" />
+            <field name="reward_id" ref="badge_31"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_supporter">
-            <field name="definition_id" eval="ref('definition_supporter')" />
+            <field name="definition_id" ref="definition_supporter"/>
             <field name="target_goal">1</field>
-            <field name="challenge_id" eval="ref('challenge_supporter')" />
+            <field name="challenge_id" ref="challenge_supporter"/>
         </record>
 
 
@@ -165,11 +165,11 @@
             <field name="description">Delete own post with 3 or more down votes</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="condition">higher</field>
             <field name="domain">[('vote_count', '&lt;=', -3), ('active', '=', False)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_peer_pressure">
@@ -177,16 +177,16 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_23')" />
+            <field name="reward_id" ref="badge_23"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_peer_pressure">
-            <field name="definition_id" eval="ref('definition_peer_pressure')" />
+            <field name="definition_id" ref="definition_peer_pressure"/>
             <field name="target_goal">1</field>
-            <field name="challenge_id" eval="ref('challenge_peer_pressure')" />
+            <field name="challenge_id" ref="challenge_peer_pressure"/>
         </record>
 
     </data>
diff --git a/addons/website_forum/data/badges_participation.xml b/addons/website_forum/data/badges_participation.xml
index 310f1fb2ab6..e263003c8d3 100644
--- a/addons/website_forum/data/badges_participation.xml
+++ b/addons/website_forum/data/badges_participation.xml
@@ -14,7 +14,7 @@
             <field name="description">Write some information about yourself</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('base.model_res_users')" />
+            <field name="model_id" ref="base.model_res_users"/>
             <field name="condition">higher</field>
             <field name="domain">[
                 ('partner_id.country_id', '!=', False),
@@ -22,7 +22,7 @@
                 ('partner_id.email', '!=', False)
             ]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('base.field_res_users__id')" />
+            <field name="batch_distinctive_field" ref="base.field_res_users__id"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_configure_profile">
@@ -30,15 +30,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_p_1')"/>
+            <field name="reward_id" ref="badge_p_1"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_configure_profile">
-            <field name="definition_id" eval="ref('definition_configure_profile')"/>
-            <field name="challenge_id" eval="ref('challenge_configure_profile')"/>
+            <field name="definition_id" ref="definition_configure_profile"/>
+            <field name="challenge_id" ref="challenge_configure_profile"/>
             <field name="target_goal">1</field>
         </record>
 
@@ -54,11 +54,11 @@
             <field name="description">Comment an answer or a question</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('mail.model_mail_message')"/>
+            <field name="model_id" ref="mail.model_mail_message"/>
             <field name="condition">higher</field>
             <field name="domain" eval="[('message_type', '=', 'comment'), ('subtype_id', '=', ref('mail.mt_comment')), ('model', '=', 'forum.post')]"/>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('mail.field_mail_message__author_id')" />
+            <field name="batch_distinctive_field" ref="mail.field_mail_message__author_id"/>
             <field name="batch_user_expression">user.partner_id.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_commentator">
@@ -66,15 +66,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_p_2')"/>
+            <field name="reward_id" ref="badge_p_2"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_commentator">
-            <field name="definition_id" eval="ref('definition_commentator')"/>
-            <field name="challenge_id" eval="ref('challenge_commentator')"/>
+            <field name="definition_id" ref="definition_commentator"/>
+            <field name="challenge_id" ref="challenge_commentator"/>
             <field name="target_goal">10</field>
         </record>
 
@@ -90,10 +90,10 @@
             <field name="description">Post 10 answers with score of 10 or more</field>
             <field name="display_mode">boolean</field>
             <field name="condition">higher</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')"/>
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain" eval="[('parent', '!=', False), ('vote_count' '>=', 10)]"/>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_pundit">
@@ -101,16 +101,16 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_25')" />
+            <field name="reward_id" ref="badge_25"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_pundit">
-            <field name="definition_id" eval="ref('definition_pundit')" />
+            <field name="definition_id" ref="definition_pundit"/>
             <field name="target_goal">10</field>
-            <field name="challenge_id" eval="ref('challenge_pundit')" />
+            <field name="challenge_id" ref="challenge_pundit"/>
         </record>
 
         <!-- Chief Commentator: 100 comments -->
@@ -125,15 +125,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_p_4')"/>
+            <field name="reward_id" ref="badge_p_4"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_chief_commentator">
-            <field name="definition_id" eval="ref('definition_commentator')"/>
-            <field name="challenge_id" eval="ref('challenge_chief_commentator')"/>
+            <field name="definition_id" ref="definition_commentator"/>
+            <field name="challenge_id" ref="challenge_chief_commentator"/>
             <field name="target_goal">100</field>
         </record>
 
@@ -148,11 +148,11 @@
             <field name="description">Create a tag which can used in minimum 15 questions</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_tag')" />
+            <field name="model_id" ref="website_forum.model_forum_tag"/>
             <field name="condition">higher</field>
             <field name="domain">[('posts_count', '>=', 15)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_tag__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_tag__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_taxonomist">
@@ -160,15 +160,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_32')" />
+            <field name="reward_id" ref="badge_32"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_taxonomist">
-            <field name="definition_id" eval="ref('definition_taxonomist')" />
-            <field name="challenge_id" eval="ref('challenge_taxonomist')" />
+            <field name="definition_id" ref="definition_taxonomist"/>
+            <field name="challenge_id" ref="challenge_taxonomist"/>
             <field name="target_goal">1</field>
         </record>
 
diff --git a/addons/website_forum/data/badges_question.xml b/addons/website_forum/data/badges_question.xml
index ecd45cb4ae3..1da47fa218c 100644
--- a/addons/website_forum/data/badges_question.xml
+++ b/addons/website_forum/data/badges_question.xml
@@ -15,11 +15,11 @@
             <field name="description">Asked a question with at least 150 views</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain">[('parent_id', '=', False), ('views', '>=', 150)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_popular_question">
@@ -27,15 +27,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_q_1')" />
+            <field name="reward_id" ref="badge_q_1"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_popular_question">
-            <field name="definition_id" eval="ref('definition_popular_question')"/>
-            <field name="challenge_id" eval="ref('challenge_popular_question')"/>
+            <field name="definition_id" ref="definition_popular_question"/>
+            <field name="challenge_id" ref="challenge_popular_question"/>
             <field name="target_goal">1</field>
         </record>
 
@@ -51,11 +51,11 @@
             <field name="description">Asked a question with at least 250 views</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain">[('parent_id', '=', False), ('views', '>=', 250)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_notable_question">
@@ -63,15 +63,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_q_2')" />
+            <field name="reward_id" ref="badge_q_2"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_notable_question">
-            <field name="definition_id" eval="ref('definition_notable_question')"/>
-            <field name="challenge_id" eval="ref('challenge_notable_question')"/>
+            <field name="definition_id" ref="definition_notable_question"/>
+            <field name="challenge_id" ref="challenge_notable_question"/>
             <field name="target_goal">1</field>
         </record>
         <!-- Famous: 500 views -->
@@ -86,11 +86,11 @@
             <field name="description">Asked a question with at least 500 views</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain">[('parent_id', '=', False), ('views', '>=', 500)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_famous_question">
@@ -98,15 +98,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_q_3')" />
+            <field name="reward_id" ref="badge_q_3"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_famous_question">
-            <field name="definition_id" eval="ref('definition_famous_question')"/>
-            <field name="challenge_id" eval="ref('challenge_famous_question')"/>
+            <field name="definition_id" ref="definition_famous_question"/>
+            <field name="challenge_id" ref="challenge_famous_question"/>
             <field name="target_goal">1</field>
         </record>
 
@@ -123,11 +123,11 @@
             <field name="description">Question set as favorite by 1 user</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain">[('parent_id', '=', False), ('favourite_count', '>=', 1)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_favorite_question_1">
@@ -135,15 +135,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_q_4')" />
+            <field name="reward_id" ref="badge_q_4"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_favorite_question_1">
-            <field name="definition_id" eval="ref('definition_favorite_question_1')"/>
-            <field name="challenge_id" eval="ref('challenge_favorite_question_1')"/>
+            <field name="definition_id" ref="definition_favorite_question_1"/>
+            <field name="challenge_id" ref="challenge_favorite_question_1"/>
             <field name="target_goal">1</field>
         </record>
         <!-- Favorite: at least 5 users have it in favorite -->
@@ -158,11 +158,11 @@
             <field name="description">Question set as favorite by 5 user</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain">[('parent_id', '=', False), ('favourite_count', '>=', 5)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_favorite_question_5">
@@ -170,15 +170,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_q_5')" />
+            <field name="reward_id" ref="badge_q_5"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_favorite_question_5">
-            <field name="definition_id" eval="ref('definition_favorite_question_5')"/>
-            <field name="challenge_id" eval="ref('challenge_favorite_question_5')"/>
+            <field name="definition_id" ref="definition_favorite_question_5"/>
+            <field name="challenge_id" ref="challenge_favorite_question_5"/>
             <field name="target_goal">1</field>
         </record>
         <!-- Stellar: at least 25 users have it in favorite -->
@@ -193,11 +193,11 @@
             <field name="description">Question set as favorite by 25 user</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain">[('parent_id', '=', False), ('favourite_count', '>=', 25)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_stellar_question_25">
@@ -205,15 +205,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_q_6')" />
+            <field name="reward_id" ref="badge_q_6"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_stellar_question_25">
-            <field name="definition_id" eval="ref('definition_stellar_question_25')"/>
-            <field name="challenge_id" eval="ref('challenge_stellar_question_25')"/>
+            <field name="definition_id" ref="definition_stellar_question_25"/>
+            <field name="challenge_id" ref="challenge_stellar_question_25"/>
             <field name="target_goal">1</field>
         </record>
 
@@ -230,11 +230,11 @@
             <field name="description">Asked first question with at least one up vote</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain">[('parent_id', '=', False), ('vote_count', '>=', 1)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_student">
@@ -242,15 +242,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_q_7')"/>
+            <field name="reward_id" ref="badge_q_7"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_student">
-            <field name="definition_id" eval="ref('definition_student')"/>
-            <field name="challenge_id" eval="ref('challenge_student')"/>
+            <field name="definition_id" ref="definition_student"/>
+            <field name="challenge_id" ref="challenge_student"/>
             <field name="target_goal">1</field>
         </record>
         <!-- Nice: at least 4 upvotes -->
@@ -265,11 +265,11 @@
             <field name="description">Asked first question with at least 4 up votes</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain">[('parent_id', '=', False), ('vote_count', '>=', 4)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_nice_question">
@@ -277,15 +277,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_q_8')" />
+            <field name="reward_id" ref="badge_q_8"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_nice_question">
-            <field name="definition_id" eval="ref('definition_nice_question')"/>
-            <field name="challenge_id" eval="ref('challenge_nice_question')"/>
+            <field name="definition_id" ref="definition_nice_question"/>
+            <field name="challenge_id" ref="challenge_nice_question"/>
             <field name="target_goal">1</field>
         </record>
         <!-- Good: at least 6 upvotes -->
@@ -300,11 +300,11 @@
             <field name="description">Asked first question with at least 6 up votes</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain">[('parent_id', '=', False), ('vote_count', '>=', 6)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_good_question">
@@ -312,15 +312,15 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_q_9')" />
+            <field name="reward_id" ref="badge_q_9"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_good_question">
-            <field name="definition_id" eval="ref('definition_good_question')"/>
-            <field name="challenge_id" eval="ref('challenge_good_question')"/>
+            <field name="definition_id" ref="definition_good_question"/>
+            <field name="challenge_id" ref="challenge_good_question"/>
             <field name="target_goal">1</field>
         </record>
         <!-- Great: at least 15 upvotes -->
@@ -335,11 +335,11 @@
             <field name="description">Asked first question with at least 15 up votes</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain">[('parent_id', '=', False), ('vote_count', '>=', 15)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_great_question">
@@ -347,16 +347,16 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_q_10')" />
+            <field name="reward_id" ref="badge_q_10"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_great_question">
-            <field name="definition_id" eval="ref('definition_great_question')" />
+            <field name="definition_id" ref="definition_great_question"/>
             <field name="target_goal">1</field>
-            <field name="challenge_id" eval="ref('challenge_great_question')" />
+            <field name="challenge_id" ref="challenge_great_question"/>
         </record>
 
         <!-- Question + Answer -->
@@ -371,11 +371,11 @@
             <field name="description">Ask a question and accept an answer</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">boolean</field>
-            <field name="model_id" eval="ref('website_forum.model_forum_post')" />
+            <field name="model_id" ref="website_forum.model_forum_post"/>
             <field name="domain">[('parent_id', '=', False), ('has_validated_answer', '=', True)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
+            <field name="batch_distinctive_field" ref="website_forum.field_forum_post__create_uid"/>
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_scholar">
@@ -383,16 +383,16 @@
             <field name="period">once</field>
             <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
-            <field name="reward_id" eval="ref('badge_26')" />
+            <field name="reward_id" ref="badge_26"/>
             <field name="reward_realtime">True</field>
             <field name="user_domain">[('karma', '>', 0)]</field>
             <field name="state">inprogress</field>
             <field name="challenge_category">forum</field>
         </record>
         <record model="gamification.challenge.line" id="line_scholar">
-            <field name="definition_id" eval="ref('definition_scholar')" />
+            <field name="definition_id" ref="definition_scholar"/>
             <field name="target_goal">1</field>
-            <field name="challenge_id" eval="ref('challenge_scholar')" />
+            <field name="challenge_id" ref="challenge_scholar"/>
         </record>
 
     </data>
diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index 8d3b05c2570..bda7eb83e21 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -58,7 +58,7 @@
             <field name="res_model">forum.forum</field>
             <field name="default" eval="True"/>
             <field name="hidden" eval="False"/>
-            <field name="parent_id" eval="ref('mt_answer_new')"/>
+            <field name="parent_id" ref="mt_answer_new"/>
             <field name="relation_field">forum_id</field>
         </record>
         <record id="mt_forum_question_new" model="mail.message.subtype">
@@ -66,7 +66,7 @@
             <field name="res_model">forum.forum</field>
             <field name="default" eval="True"/>
             <field name="hidden" eval="False"/>
-            <field name="parent_id" eval="ref('mt_question_new')"/>
+            <field name="parent_id" ref="mt_question_new"/>
             <field name="relation_field">forum_id</field>
         </record>
 
diff --git a/addons/website_slides/data/gamification_data.xml b/addons/website_slides/data/gamification_data.xml
index cefecaac089..134b13020ce 100644
--- a/addons/website_slides/data/gamification_data.xml
+++ b/addons/website_slides/data/gamification_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo><data noupdate="0">
+<odoo>
 
     <!-- Get started: register to the platform -->
     <record id="badge_data_register" model="gamification.badge">
@@ -15,14 +15,14 @@
         <field name="description">Register to the platform</field>
         <field name="computation_mode">count</field>
         <field name="display_mode">boolean</field>
-        <field name="model_id" eval="ref('base.model_res_users')"/>
+        <field name="model_id" ref="base.model_res_users"/>
         <field name="condition">higher</field>
         <field name="domain">[
             ('active', '!=', False),
             ('karma', '>', 0),
         ]</field>
         <field name="batch_mode">True</field>
-        <field name="batch_distinctive_field" eval="ref('base.field_res_users__id')"/>
+        <field name="batch_distinctive_field" ref="base.field_res_users__id"/>
         <field name="batch_user_expression">user.id</field>
     </record>
     <record id="badge_data_register_challenge" model="gamification.challenge">
@@ -31,14 +31,14 @@
         <field name="period">once</field>
         <field name="visibility_mode">personal</field>
         <field name="report_message_frequency">never</field>
-        <field name="reward_id" eval="ref('badge_data_register')"/>
+        <field name="reward_id" ref="badge_data_register"/>
         <field name="reward_realtime">True</field>
         <field name="user_domain">[('karma', '>', 0)]</field>
         <field name="state">inprogress</field>
     </record>
     <record id="badge_data_register_challenge_line_0" model="gamification.challenge.line">
-        <field name="definition_id" eval="ref('badge_data_register_goal')"/>
-        <field name="challenge_id" eval="ref('badge_data_register_challenge')"/>
+        <field name="definition_id" ref="badge_data_register_goal"/>
+        <field name="challenge_id" ref="badge_data_register_challenge"/>
         <field name="target_goal">1</field>
     </record>
 
@@ -56,7 +56,7 @@
         <field name="description">Complete your profile</field>
         <field name="computation_mode">count</field>
         <field name="display_mode">boolean</field>
-        <field name="model_id" eval="ref('base.model_res_users')"/>
+        <field name="model_id" ref="base.model_res_users"/>
         <field name="condition">higher</field>
         <field name="domain">[
             ('partner_id.country_id', '!=', False),
@@ -64,7 +64,7 @@
             ('partner_id.email', '!=', False)
         ]</field>
         <field name="batch_mode">True</field>
-        <field name="batch_distinctive_field" eval="ref('base.field_res_users__id')"/>
+        <field name="batch_distinctive_field" ref="base.field_res_users__id"/>
         <field name="batch_user_expression">user.id</field>
     </record>
     <record id="badge_data_profile_challenge" model="gamification.challenge">
@@ -73,14 +73,14 @@
         <field name="period">once</field>
         <field name="visibility_mode">personal</field>
         <field name="report_message_frequency">never</field>
-        <field name="reward_id" eval="ref('badge_data_profile')"/>
+        <field name="reward_id" ref="badge_data_profile"/>
         <field name="reward_realtime">True</field>
         <field name="user_domain">[('karma', '>', 0)]</field>
         <field name="state">inprogress</field>
     </record>
     <record id="badge_data_profile_challenge_line_0" model="gamification.challenge.line">
-        <field name="definition_id" eval="ref('badge_data_profile_goal')"/>
-        <field name="challenge_id" eval="ref('badge_data_profile_challenge')"/>
+        <field name="definition_id" ref="badge_data_profile_goal"/>
+        <field name="challenge_id" ref="badge_data_profile_challenge"/>
         <field name="target_goal">1</field>
     </record>
 
@@ -98,13 +98,13 @@
         <field name="description">Complete a course</field>
         <field name="computation_mode">count</field>
         <field name="display_mode">boolean</field>
-        <field name="model_id" eval="ref('website_slides.model_slide_channel_partner')"/>
+        <field name="model_id" ref="website_slides.model_slide_channel_partner"/>
         <field name="condition">higher</field>
         <field name="domain">[
             ('completed', '=', True)
         ]</field>
         <field name="batch_mode">True</field>
-        <field name="batch_distinctive_field" eval="ref('website_slides.field_slide_channel_partner__partner_id')"/>
+        <field name="batch_distinctive_field" ref="website_slides.field_slide_channel_partner__partner_id"/>
         <field name="batch_user_expression">user.partner_id.id</field>
     </record>
     <record id="badge_data_course_challenge" model="gamification.challenge">
@@ -113,14 +113,14 @@
         <field name="period">once</field>
         <field name="visibility_mode">personal</field>
         <field name="report_message_frequency">never</field>
-        <field name="reward_id" eval="ref('badge_data_course')"/>
+        <field name="reward_id" ref="badge_data_course"/>
         <field name="reward_realtime">True</field>
         <field name="user_domain">[('karma', '>', 0)]</field>
         <field name="state">inprogress</field>
     </record>
     <record id="badge_data_course_challenge_line_0" model="gamification.challenge.line">
-        <field name="definition_id" eval="ref('badge_data_course_goal')"/>
-        <field name="challenge_id" eval="ref('badge_data_course_challenge')"/>
+        <field name="definition_id" ref="badge_data_course_goal"/>
+        <field name="challenge_id" ref="badge_data_course_challenge"/>
         <field name="target_goal">1</field>
     </record>
 
@@ -138,14 +138,14 @@
         <field name="description">Get a certification</field>
         <field name="computation_mode">count</field>
         <field name="display_mode">boolean</field>
-        <field name="model_id" eval="ref('website_slides.model_slide_slide_partner')"/>
+        <field name="model_id" ref="website_slides.model_slide_slide_partner"/>
         <field name="condition">higher</field>
         <field name="domain">[
             ('completed', '=', True),
             (0, '=', 1)
         ]</field>
         <field name="batch_mode">True</field>
-        <field name="batch_distinctive_field" eval="ref('website_slides.field_slide_slide_partner__partner_id')"/>
+        <field name="batch_distinctive_field" ref="website_slides.field_slide_slide_partner__partner_id"/>
         <field name="batch_user_expression">user.partner_id.id</field>
     </record>
     <record id="badge_data_certification_challenge" model="gamification.challenge">
@@ -154,14 +154,14 @@
         <field name="period">once</field>
         <field name="visibility_mode">personal</field>
         <field name="report_message_frequency">never</field>
-        <field name="reward_id" eval="ref('badge_data_certification')"/>
+        <field name="reward_id" ref="badge_data_certification"/>
         <field name="reward_realtime">True</field>
         <field name="user_domain">[('karma', '>', 0)]</field>
         <field name="state">inprogress</field>
     </record>
     <record id="badge_data_certification_challenge_line_0" model="gamification.challenge.line">
-        <field name="definition_id" eval="ref('badge_data_certification_goal')"/>
-        <field name="challenge_id" eval="ref('badge_data_certification_challenge')"/>
+        <field name="definition_id" ref="badge_data_certification_goal"/>
+        <field name="challenge_id" ref="badge_data_certification_challenge"/>
         <field name="target_goal">1</field>
     </record>
 
@@ -179,13 +179,13 @@
         <field name="description">Reach 2000 XP</field>
         <field name="computation_mode">count</field>
         <field name="display_mode">boolean</field>
-        <field name="model_id" eval="ref('base.model_res_users')"/>
+        <field name="model_id" ref="base.model_res_users"/>
         <field name="condition">higher</field>
         <field name="domain">[
             ('karma', '>=', 2000)
         ]</field>
         <field name="batch_mode">True</field>
-        <field name="batch_distinctive_field" eval="ref('base.field_res_users__id')"/>
+        <field name="batch_distinctive_field" ref="base.field_res_users__id"/>
         <field name="batch_user_expression">user.id</field>
     </record>
     <record id="badge_data_karma_challenge" model="gamification.challenge">
@@ -194,14 +194,14 @@
         <field name="period">once</field>
         <field name="visibility_mode">personal</field>
         <field name="report_message_frequency">never</field>
-        <field name="reward_id" eval="ref('badge_data_karma')"/>
+        <field name="reward_id" ref="badge_data_karma"/>
         <field name="reward_realtime">True</field>
         <field name="user_domain">[('karma', '>', 0)]</field>
         <field name="state">inprogress</field>
     </record>
     <record id="badge_data_karma_challenge_line_0" model="gamification.challenge.line">
-        <field name="definition_id" eval="ref('badge_data_karma_goal')"/>
-        <field name="challenge_id" eval="ref('badge_data_karma_challenge')"/>
+        <field name="definition_id" ref="badge_data_karma_goal"/>
+        <field name="challenge_id" ref="badge_data_karma_challenge"/>
         <field name="target_goal">1</field>
     </record>
-</data></odoo>
+</odoo>
diff --git a/odoo/addons/base/data/res_partner_demo.xml b/odoo/addons/base/data/res_partner_demo.xml
index 6975f0db46b..ece298c2c67 100644
--- a/odoo/addons/base/data/res_partner_demo.xml
+++ b/odoo/addons/base/data/res_partner_demo.xml
@@ -141,49 +141,49 @@
 
         <record id="res_partner_address_1" model="res.partner">
             <field name="name">Willie Burke</field>
-            <field name="parent_id" eval="ref('res_partner_1')"/>
+            <field name="parent_id" ref="res_partner_1"/>
             <field name="function">Service Manager</field>
             <field name="email">willie.burke80@example.com</field>
             <field name="phone">(846)-523-2111</field>
         </record>
         <record id="res_partner_address_2" model="res.partner">
             <field name="name">Ron Gibson</field>
-            <field name="parent_id" eval="ref('res_partner_1')"/>
+            <field name="parent_id" ref="res_partner_1"/>
             <field name="function">Store Manager</field>
             <field name="email">ron.gibson76@example.com</field>
             <field name="phone">(976)-397-4091</field>
         </record>
         <record id="res_partner_address_3" model="res.partner">
             <field name="name">Douglas Fletcher</field>
-            <field name="parent_id" eval="ref('res_partner_2')"/>
+            <field name="parent_id" ref="res_partner_2"/>
             <field name="function">Functional Consultant</field>
             <field name="email">douglas.fletcher51@example.com</field>
             <field name="phone">(132)-553-7242</field>
         </record>
         <record id="res_partner_address_4" model="res.partner">
             <field name="name">Floyd Steward</field>
-            <field name="parent_id" eval="ref('res_partner_2')"/>
+            <field name="parent_id" ref="res_partner_2"/>
             <field name="function">Analyst</field>
             <field name="email">floyd.steward34@example.com</field>
             <field name="phone">(145)-138-3401</field>
         </record>
         <record id="res_partner_address_5" model="res.partner">
             <field name="name">Edwin Hansen</field>
-            <field name="parent_id" eval="ref('res_partner_3')"/>
+            <field name="parent_id" ref="res_partner_3"/>
             <field name="function">Marketing Manager</field>
             <field name="email">edwin.hansen58@example.com</field>
             <field name="phone">(943)-352-2555</field>
         </record>
         <record id="res_partner_address_7" model="res.partner">
             <field name="name">Billy Fox</field>
-            <field name="parent_id" eval="ref('res_partner_4')"/>
+            <field name="parent_id" ref="res_partner_4"/>
             <field name="function">Production Supervisor</field>
             <field name="email">billy.fox45@example.com</field>
             <field name="phone">(915)-498-5611</field>
         </record>
         <record id="res_partner_address_10" model="res.partner">
             <field name="name">Jesse Brown</field>
-            <field name="parent_id" eval="ref('res_partner_3')"/>
+            <field name="parent_id" ref="res_partner_3"/>
             <field name="function">Senior Consultant</field>
             <field name="email">jesse.brown74@example.com</field>
             <field name="phone">(829)-386-3277</field>
@@ -191,21 +191,21 @@
         </record>
         <record id="res_partner_address_11" model="res.partner">
             <field name="name">Soham Palmer</field>
-            <field name="parent_id" eval="ref('res_partner_3')"/>
+            <field name="parent_id" ref="res_partner_3"/>
             <field name="function">Director</field>
             <field name="email">soham.palmer15@example.com</field>
             <field name="phone">(379)-167-2040</field>
         </record>
         <record id="res_partner_address_13" model="res.partner">
             <field name="name">Kim Snyder</field>
-            <field name="parent_id" eval="ref('res_partner_4')"/>
+            <field name="parent_id" ref="res_partner_4"/>
             <field name="function">Senior Associate</field>
             <field name="email">kim.snyder96@example.com</field>
             <field name="phone">(215)-379-4865</field>
         </record>
         <record id="res_partner_address_14" model="res.partner">
             <field name="name">Edith Sanchez</field>
-            <field name="parent_id" eval="ref('res_partner_4')"/>
+            <field name="parent_id" ref="res_partner_4"/>
             <field name="function">Analyst</field>
             <field name="email">edith.sanchez68@example.com</field>
             <field name="phone">(938)-175-2048</field>
@@ -213,48 +213,48 @@
         <record id="res_partner_address_15" model="res.partner">
             <field name="name">Brandon Freeman</field>
             <field name="function">Creative Director</field>
-            <field name="parent_id" eval="ref('res_partner_12')"/>
+            <field name="parent_id" ref="res_partner_12"/>
             <field name="email">brandon.freeman55@example.com</field>
             <field name="phone">(355)-687-3262</field>
         </record>
         <record id="res_partner_address_16" model="res.partner">
             <field name="name">Nicole Ford</field>
             <field name="function">Director</field>
-            <field name="parent_id" eval="ref('res_partner_12')"/>
+            <field name="parent_id" ref="res_partner_12"/>
             <field name="email">nicole.ford75@example.com</field>
             <field name="phone">(946)-638-6034</field>
         </record>
         <record id="res_partner_address_17" model="res.partner">
             <field name="name">Toni Rhodes</field>
             <field name="function">Managing Partner</field>
-            <field name="parent_id" eval="ref('res_partner_10')"/>
+            <field name="parent_id" ref="res_partner_10"/>
             <field name="email">toni.rhodes11@example.com</field>
             <field name="phone">(198)-539-4948</field>
         </record>
         <record id="res_partner_address_18" model="res.partner">
             <field name="name">Gordon Owens</field>
             <field name="function">Senior Consultant</field>
-            <field name="parent_id" eval="ref('res_partner_10')"/>
+            <field name="parent_id" ref="res_partner_10"/>
             <field name="email">gordon.owens47@example.com</field>
             <field name="phone">(336)-723-6569</field>
         </record>
         <record id="res_partner_address_24" model="res.partner">
             <field name="name">Theodore Gardner</field>
             <field name="function">System Analyst</field>
-            <field name="parent_id" eval="ref('res_partner_4')"/>
+            <field name="parent_id" ref="res_partner_4"/>
             <field name="email">theodore.gardner36@example.com</field>
             <field name="phone">(186)-612-6561</field>
         </record>
         <record id="res_partner_address_25" model="res.partner">
             <field name="name">Oscar Morgan</field>
-            <field name="parent_id" eval="ref('res_partner_3')"/>
+            <field name="parent_id" ref="res_partner_3"/>
             <field name="function">Order Clerk</field>
             <field name="email">oscar.morgan11@example.com</field>
             <field name="phone">(561)-239-1744</field>
         </record>
         <record id="res_partner_address_27" model="res.partner">
             <field name="name">Tom Ruiz</field>
-            <field name="parent_id" eval="ref('res_partner_1')"/>
+            <field name="parent_id" ref="res_partner_1"/>
             <field name="function">Software Developer</field>
             <field name="email">tom.ruiz89@example.com</field>
             <field name="phone">(102)-834-1602</field>
@@ -262,48 +262,48 @@
         <record id="res_partner_address_28" model="res.partner">
             <field name="name">Colleen Diaz</field>
             <field name="function">Business Executive</field>
-            <field name="parent_id" eval="ref('res_partner_12')"/>
+            <field name="parent_id" ref="res_partner_12"/>
             <field name="email">colleen.diaz83@example.com</field>
             <field name="phone">(255)-595-8393</field>
         </record>
         <record id="res_partner_address_30" model="res.partner">
             <field name="name">Lorraine Douglas</field>
             <field name="function">Functional Consultant</field>
-            <field name="parent_id" eval="ref('res_partner_18')"/>
+            <field name="parent_id" ref="res_partner_18"/>
             <field name="email">lorraine.douglas35@example.com</field>
             <field name="phone">(443)-648-9155</field>
         </record>
         <record id="res_partner_address_31" model="res.partner">
             <field name="name">Addison Olson</field>
-            <field name="parent_id" eval="ref('res_partner_2')"/>
+            <field name="parent_id" ref="res_partner_2"/>
             <field name="function">Sales Representative</field>
             <field name="email">addison.olson28@example.com</field>
             <field name="phone">(223)-399-7637</field>
         </record>
         <record id="res_partner_address_32" model="res.partner">
             <field name="name">Sandra Neal</field>
-            <field name="parent_id" eval="ref('res_partner_4')"/>
+            <field name="parent_id" ref="res_partner_4"/>
             <field name="function">Sales Manager</field>
             <field name="email">sandra.neal80@example.com</field>
             <field name="phone">(430)-371-7293</field>
         </record>
         <record id="res_partner_address_33" model="res.partner">
             <field name="name">Julie Richards</field>
-            <field name="parent_id" eval="ref('res_partner_4')"/>
+            <field name="parent_id" ref="res_partner_4"/>
             <field name="function">Financial Manager</field>
             <field name="email">julie.richards84@example.com</field>
             <field name="phone">(225)-148-7811</field>
         </record>
         <record id="res_partner_address_34" model="res.partner">
             <field name="name">Travis Mendoza</field>
-            <field name="parent_id" eval="ref('res_partner_4')"/>
+            <field name="parent_id" ref="res_partner_4"/>
             <field name="function">Knowledge Manager</field>
             <field name="email">travis.mendoza24@example.com</field>
             <field name="phone">(840)-944-8661</field>
         </record>
         <record id="res_partner_main1" model="res.partner">
             <field name="name">Chester Reed</field>
-            <field name="parent_id" eval="ref('main_partner')"/>
+            <field name="parent_id" ref="main_partner"/>
             <field name="function">Chief Executive Officer (CEO)</field>
             <field name="email">chester.reed79@example.com</field>
             <field name="phone">(979)-904-8902</field>
@@ -311,7 +311,7 @@
         <record id="res_partner_main2" model="res.partner">
             <field name="name">Dwayne Newman</field>
             <field name="function">Chief Operations Officer (COO)</field>
-            <field name="parent_id" eval="ref('main_partner')"/>
+            <field name="parent_id" ref="main_partner"/>
             <field name="email">dwayne.newman28@example.com</field>
             <field name="phone">(614)-177-4937</field>
         </record>