From 80b61a9f63b652c99c2d7941aa344302b09a0057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 25 Feb 2024 13:45:21 +0100
Subject: [PATCH] Store model on ir.rule.group

---
 modules/account/account.xml                   | 15 ++-
 modules/account/fiscalyear.xml                |  2 +-
 modules/account/move.xml                      |  9 +-
 modules/account/move_template.xml             |  3 +-
 modules/account/period.xml                    |  2 +-
 modules/account/tax.xml                       |  6 +-
 modules/account_asset/asset.xml               |  2 +-
 modules/account_budget/account.xml            |  2 +-
 modules/account_dunning/dunning.xml           |  2 +-
 modules/account_invoice/account.xml           |  3 +-
 modules/account_invoice/invoice.xml           |  6 +-
 modules/account_invoice_defer/account.xml     |  2 +-
 modules/account_payment/party.xml             |  2 +-
 modules/account_payment/payment.xml           |  6 +-
 modules/account_payment_sepa/payment.xml      |  5 +-
 modules/account_product/product.xml           |  4 +-
 modules/account_receivable_rule/account.xml   |  2 +-
 modules/account_rule/account.xml              |  2 +-
 modules/account_statement/journal.xml         |  2 +-
 modules/account_statement/statement.xml       |  2 +-
 modules/account_statement_rule/account.xml    |  2 +-
 modules/account_stock_eu/account_stock_eu.xml |  2 +-
 modules/account_stock_landed_cost/account.xml |  2 +-
 .../account_stock_shipment_cost/account.xml   |  2 +-
 modules/analytic_account/account.xml          |  6 +-
 modules/analytic_account/line.xml             |  3 +-
 modules/analytic_account/rule.xml             |  3 +-
 modules/analytic_budget/analytic_account.xml  |  2 +-
 modules/attendance/attendance.xml             | 20 ++--
 modules/commission/commission.xml             |  3 +-
 modules/commission/commission_reporting.xml   |  6 +-
 modules/company/ir.xml                        |  4 +-
 modules/company/tests/test_module.py          |  4 +-
 modules/document_incoming/document.xml        |  2 +-
 modules/document_incoming_ocr/document.xml    |  2 +-
 modules/incoterm/party.xml                    |  2 +-
 modules/product_price_list/price_list.xml     |  2 +-
 modules/production/production.xml             |  2 +-
 modules/production_work/work.xml              |  7 +-
 modules/project/work.xml                      |  2 +-
 modules/purchase/purchase.xml                 |  4 +-
 modules/purchase/purchase_reporting.xml       | 12 +--
 modules/purchase_amendment/purchase.xml       |  2 +-
 .../purchase_blanket_agreement/purchase.xml   |  2 +-
 modules/purchase_request/purchase_request.xml |  2 +-
 .../purchase_request_quotation/purchase.xml   |  3 +-
 modules/purchase_requisition/purchase.xml     |  8 +-
 modules/quality/quality.xml                   |  4 +-
 modules/sale/sale.xml                         |  2 +-
 modules/sale/sale_reporting.xml               | 26 +++---
 modules/sale_amendment/sale.xml               |  2 +-
 modules/sale_blanket_agreement/sale.xml       |  2 +-
 modules/sale_complaint/complaint.xml          |  2 +-
 modules/sale_extra/sale.xml                   |  2 +-
 modules/sale_gift_card/sale.xml               |  2 +-
 modules/sale_opportunity/opportunity.xml      |  2 +-
 .../opportunity_reporting.xml                 | 12 +--
 modules/sale_point/sale.xml                   | 12 +--
 modules/sale_promotion/sale.xml               |  2 +-
 modules/sale_subscription/subscription.xml    |  2 +-
 modules/sale_supply_drop_shipment/stock.xml   |  3 +-
 modules/stock/inventory.xml                   |  2 +-
 modules/stock/move.xml                        |  2 +-
 modules/stock/period.xml                      |  2 +-
 modules/stock/product.xml                     |  6 +-
 modules/stock/shipment.xml                    | 10 +-
 modules/stock/stock_reporting_margin.xml      | 12 +--
 modules/stock_forecast/forecast.xml           |  2 +-
 modules/stock_location_move/stock.xml         |  4 +-
 modules/stock_lot/stock.xml                   |  2 +-
 modules/stock_package/stock.xml               |  2 +-
 .../stock_quantity_early_planning/stock.xml   |  2 +-
 modules/stock_quantity_issue/stock.xml        |  2 +-
 modules/stock_supply/order_point.xml          |  2 +-
 modules/timesheet/line.xml                    | 24 ++---
 modules/timesheet/work.xml                    |  2 +-
 modules/web_shop/web.xml                      |  2 +-
 trytond/CHANGELOG                             |  1 +
 trytond/trytond/ir/rule.py                    | 50 +++++++---
 trytond/trytond/ir/view/rule_group_form.xml   |  4 +-
 trytond/trytond/ir/view/rule_group_list.xml   |  2 +-
 trytond/trytond/res/ir.xml                    |  8 +-
 trytond/trytond/res/user.xml                  |  8 +-
 trytond/trytond/tests/test_rule.py            | 92 +++++--------------
 84 files changed, 230 insertions(+), 278 deletions(-)

diff --git a/modules/account/account.xml b/modules/account/account.xml
index e0c4ae44da..e7c2e1118b 100644
--- a/modules/account/account.xml
+++ b/modules/account/account.xml
@@ -239,8 +239,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_account_type_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'account.account.type')]"/>
+            <field name="model">account.account.type</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_account_type_companies">
@@ -564,7 +563,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_account_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.account')]"/>
+            <field name="model">account.account</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_account_companies">
@@ -668,8 +667,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_general_ledger_account_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'account.general_ledger.account')]"/>
+            <field name="model">account.general_ledger.account</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_general_ledger_account_companies">
@@ -755,7 +753,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_general_ledger_account_party_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.general_ledger.account.party')]"/>
+            <field name="model">account.general_ledger.account.party</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_general_ledger_account_party_companies">
@@ -798,8 +796,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_general_ledger_line_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'account.general_ledger.line')]"/>
+            <field name="model">account.general_ledger.line</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_general_ledger_line_companies">
@@ -938,7 +935,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_aged_balance_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.aged_balance')]"/>
+            <field name="model">account.aged_balance</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_aged_balance_companies">
diff --git a/modules/account/fiscalyear.xml b/modules/account/fiscalyear.xml
index bd8ab58cf7..7ee6e0480f 100644
--- a/modules/account/fiscalyear.xml
+++ b/modules/account/fiscalyear.xml
@@ -85,7 +85,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_fiscalyear_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.fiscalyear')]"/>
+            <field name="model">account.fiscalyear</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_fiscalyear_companies">
diff --git a/modules/account/move.xml b/modules/account/move.xml
index 043d0fd937..885255f6ff 100644
--- a/modules/account/move.xml
+++ b/modules/account/move.xml
@@ -41,8 +41,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_move_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'account.move')]"/>
+            <field name="model">account.move</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_move_companies">
@@ -112,8 +111,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_move_reconciliation_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'account.move.reconciliation')]"/>
+            <field name="model">account.move.reconciliation</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_move_reconciliation_companies">
@@ -409,8 +407,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reconcile_writeoff_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'account.move.reconcile.write_off')]"/>
+            <field name="model">account.move.reconcile.write_off</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reconcile_writeoff_companies">
diff --git a/modules/account/move_template.xml b/modules/account/move_template.xml
index e7f7aaed5e..991743d0bc 100644
--- a/modules/account/move_template.xml
+++ b/modules/account/move_template.xml
@@ -40,8 +40,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_move_template_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'account.move.template')]"/>
+            <field name="model">account.move.template</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_move_template_companies">
diff --git a/modules/account/period.xml b/modules/account/period.xml
index 0ea496f533..72245a4efc 100644
--- a/modules/account/period.xml
+++ b/modules/account/period.xml
@@ -83,7 +83,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_period_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.period')]"/>
+            <field name="model">account.period</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_period_companies">
diff --git a/modules/account/tax.xml b/modules/account/tax.xml
index 0043628652..f46ea5a74e 100644
--- a/modules/account/tax.xml
+++ b/modules/account/tax.xml
@@ -203,7 +203,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.rule.group" id="rule_group_tax_code_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.tax.code')]" />
+            <field name="model">account.tax.code</field>
             <field name="global_p" eval="True" />
         </record>
         <record model="ir.rule" id="rule_tax_code_companies">
@@ -329,7 +329,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_tax_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.tax')]"/>
+            <field name="model">account.tax</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_tax_companies">
@@ -493,7 +493,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_tax_rule_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.tax.rule')]"/>
+            <field name="model">account.tax.rule</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_tax_rule_companies">
diff --git a/modules/account_asset/asset.xml b/modules/account_asset/asset.xml
index 50c4f4e708..3031eb465c 100644
--- a/modules/account_asset/asset.xml
+++ b/modules/account_asset/asset.xml
@@ -98,7 +98,7 @@
 
         <record model="ir.rule.group" id="rule_group_asset_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.asset')]"/>
+            <field name="model">account.asset</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_asset_companies">
diff --git a/modules/account_budget/account.xml b/modules/account_budget/account.xml
index 8cdb5a9635..827b7a3eed 100644
--- a/modules/account_budget/account.xml
+++ b/modules/account_budget/account.xml
@@ -96,7 +96,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_budget_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.budget')]"/>
+            <field name="model">account.budget</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_budget_companies">
diff --git a/modules/account_dunning/dunning.xml b/modules/account_dunning/dunning.xml
index 2a5f1da503..640583fe42 100644
--- a/modules/account_dunning/dunning.xml
+++ b/modules/account_dunning/dunning.xml
@@ -217,7 +217,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_dunning_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.dunning')]"/>
+            <field name="model">account.dunning</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_dunning_companies">
diff --git a/modules/account_invoice/account.xml b/modules/account_invoice/account.xml
index 6423b0a712..98eec1a343 100644
--- a/modules/account_invoice/account.xml
+++ b/modules/account_invoice/account.xml
@@ -94,8 +94,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.rule.group" id="rule_group_invoice_sequence_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'account.fiscalyear.invoice_sequence')]"/>
+            <field name="model">account.fiscalyear.invoice_sequence</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_invoice_sequence_companies">
diff --git a/modules/account_invoice/invoice.xml b/modules/account_invoice/invoice.xml
index 8ffca21fe7..51164dcbbd 100644
--- a/modules/account_invoice/invoice.xml
+++ b/modules/account_invoice/invoice.xml
@@ -417,7 +417,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_payment_method_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.invoice.payment.method')]"/>
+            <field name="model">account.invoice.payment.method</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_payment_method_companies">
@@ -462,7 +462,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_invoice_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.invoice')]"/>
+            <field name="model">account.invoice</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_invoice_companies">
@@ -474,7 +474,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_invoice_line_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.invoice.line')]"/>
+            <field name="model">account.invoice.line</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_invoice_line_companies">
diff --git a/modules/account_invoice_defer/account.xml b/modules/account_invoice_defer/account.xml
index d327826116..3245e3d7ec 100644
--- a/modules/account_invoice_defer/account.xml
+++ b/modules/account_invoice_defer/account.xml
@@ -121,7 +121,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_invoice_deferred_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.invoice.deferred')]"/>
+            <field name="model">account.invoice.deferred</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_invoice_deferred_companies">
diff --git a/modules/account_payment/party.xml b/modules/account_payment/party.xml
index fa5eb97e7c..1f84f7c72b 100644
--- a/modules/account_payment/party.xml
+++ b/modules/account_payment/party.xml
@@ -23,7 +23,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_party_reception_direct_debit_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'party.party.reception_direct_debit')]"/>
+            <field name="model">party.party.reception_direct_debit</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_party_reception_direct_debit_companies">
diff --git a/modules/account_payment/payment.xml b/modules/account_payment/payment.xml
index 137f87385b..ddf3a91d76 100644
--- a/modules/account_payment/payment.xml
+++ b/modules/account_payment/payment.xml
@@ -69,7 +69,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_payment_journal_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.payment.journal')]"/>
+            <field name="model">account.payment.journal</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_payment_journal_companies">
@@ -150,7 +150,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_payment_group_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.payment.group')]"/>
+            <field name="model">account.payment.group</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_payment_group_companies">
@@ -376,7 +376,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_payment_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.payment')]"/>
+            <field name="model">account.payment</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_payment_companies">
diff --git a/modules/account_payment_sepa/payment.xml b/modules/account_payment_sepa/payment.xml
index 8aff4a661c..071b0f7de8 100644
--- a/modules/account_payment_sepa/payment.xml
+++ b/modules/account_payment_sepa/payment.xml
@@ -97,7 +97,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_mandate_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.payment.sepa.mandate')]"/>
+            <field name="model">account.payment.sepa.mandate</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_payment_companies">
@@ -237,8 +237,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_message_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'account.payment.sepa.message')]"/>
+            <field name="model">account.payment.sepa.message</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_message_companies">
diff --git a/modules/account_product/product.xml b/modules/account_product/product.xml
index dadd782060..07cfdbd7bb 100644
--- a/modules/account_product/product.xml
+++ b/modules/account_product/product.xml
@@ -12,7 +12,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_category_default">
             <field name="name">Not accounting category</field>
-            <field name="model" search="[('model', '=', 'product.category')]"/>
+            <field name="model">product.category</field>
             <field name="default_p" eval="True"/>
             <field name="global_p" eval="False"/>
             <field name="perm_read" eval="False"/>
@@ -24,7 +24,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_category_accounting">
             <field name="name">Any category</field>
-            <field name="model" search="[('model', '=', 'product.category')]"/>
+            <field name="model">product.category</field>
             <field name="global_p" eval="False"/>
             <field name="perm_read" eval="False"/>
         </record>
diff --git a/modules/account_receivable_rule/account.xml b/modules/account_receivable_rule/account.xml
index 323c882d96..cfcff921f1 100644
--- a/modules/account_receivable_rule/account.xml
+++ b/modules/account_receivable_rule/account.xml
@@ -64,7 +64,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_account_receivable_rule_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.account.receivable.rule')]"/>
+            <field name="model">account.account.receivable.rule</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_account_receivable_rule_companies">
diff --git a/modules/account_rule/account.xml b/modules/account_rule/account.xml
index d0b7a654cf..4eb97c09eb 100644
--- a/modules/account_rule/account.xml
+++ b/modules/account_rule/account.xml
@@ -54,7 +54,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_account_rule_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.account.rule')]"/>
+            <field name="model">account.account.rule</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_account_rule_companies">
diff --git a/modules/account_statement/journal.xml b/modules/account_statement/journal.xml
index c87e4898f1..1b5023255d 100644
--- a/modules/account_statement/journal.xml
+++ b/modules/account_statement/journal.xml
@@ -52,7 +52,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_statement_journal_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.statement.journal')]"/>
+            <field name="model">account.statement.journal</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_statement_journal_companies">
diff --git a/modules/account_statement/statement.xml b/modules/account_statement/statement.xml
index 68bb67c799..036e6fa95a 100644
--- a/modules/account_statement/statement.xml
+++ b/modules/account_statement/statement.xml
@@ -84,7 +84,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_statement_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.statement')]"/>
+            <field name="model">account.statement</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_statement_companies">
diff --git a/modules/account_statement_rule/account.xml b/modules/account_statement_rule/account.xml
index d09729ec18..48208027e9 100644
--- a/modules/account_statement_rule/account.xml
+++ b/modules/account_statement_rule/account.xml
@@ -56,7 +56,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_rule_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.statement.rule')]"/>
+            <field name="model">account.statement.rule</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_rule_companies">
diff --git a/modules/account_stock_eu/account_stock_eu.xml b/modules/account_stock_eu/account_stock_eu.xml
index c28763e330..6752eafd63 100644
--- a/modules/account_stock_eu/account_stock_eu.xml
+++ b/modules/account_stock_eu/account_stock_eu.xml
@@ -114,7 +114,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_intrastat_declaration_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.stock.eu.intrastat.declaration')]"/>
+            <field name="model">account.stock.eu.intrastat.declaration</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_intrastat_declaration_companies">
diff --git a/modules/account_stock_landed_cost/account.xml b/modules/account_stock_landed_cost/account.xml
index 1a5917b2d7..f29d317698 100644
--- a/modules/account_stock_landed_cost/account.xml
+++ b/modules/account_stock_landed_cost/account.xml
@@ -146,7 +146,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_landed_cost_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.landed_cost')]"/>
+            <field name="model">account.landed_cost</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_landed_cost_companies">
diff --git a/modules/account_stock_shipment_cost/account.xml b/modules/account_stock_shipment_cost/account.xml
index 5dfbe31483..7675a8bffc 100644
--- a/modules/account_stock_shipment_cost/account.xml
+++ b/modules/account_stock_shipment_cost/account.xml
@@ -149,7 +149,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_shipment_cost_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'account.shipment_cost')]"/>
+            <field name="model">account.shipment_cost</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_shipment_cost_companies">
diff --git a/modules/analytic_account/account.xml b/modules/analytic_account/account.xml
index 789142291b..c3b5f5aa0c 100644
--- a/modules/analytic_account/account.xml
+++ b/modules/analytic_account/account.xml
@@ -109,8 +109,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_account_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'analytic_account.account')]"/>
+            <field name="model">analytic_account.account</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_account_companies">
@@ -183,8 +182,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_entry_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'analytic.account.entry')]"/>
+            <field name="model">analytic.account.entry</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_entry_companies">
diff --git a/modules/analytic_account/line.xml b/modules/analytic_account/line.xml
index ebfe4709f5..44c4f4691b 100644
--- a/modules/analytic_account/line.xml
+++ b/modules/analytic_account/line.xml
@@ -30,8 +30,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_line_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'analytic_account.line')]"/>
+            <field name="model">analytic_account.line</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_line_companies">
diff --git a/modules/analytic_account/rule.xml b/modules/analytic_account/rule.xml
index 03ecc73126..1082653c6a 100644
--- a/modules/analytic_account/rule.xml
+++ b/modules/analytic_account/rule.xml
@@ -37,8 +37,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_rule_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'analytic_account.rule')]"/>
+            <field name="model">analytic_account.rule</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_rule_companies">
diff --git a/modules/analytic_budget/analytic_account.xml b/modules/analytic_budget/analytic_account.xml
index 6d9234f2ff..6cdb5dd629 100644
--- a/modules/analytic_budget/analytic_account.xml
+++ b/modules/analytic_budget/analytic_account.xml
@@ -79,7 +79,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_budget_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'analytic_account.budget')]"/>
+            <field name="model">analytic_account.budget</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_budget_companies">
diff --git a/modules/attendance/attendance.xml b/modules/attendance/attendance.xml
index f266ed8e4e..378daa6c68 100644
--- a/modules/attendance/attendance.xml
+++ b/modules/attendance/attendance.xml
@@ -67,7 +67,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_attendance_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'attendance.line')]"/>
+            <field name="model">attendance.line</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_attendance_companies">
@@ -87,7 +87,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_attendance">
             <field name="name">Own attendance</field>
-            <field name="model" search="[('model', '=', 'attendance.line')]"/>
+            <field name="model">attendance.line</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
             <field name="perm_read" eval="False"/>
@@ -101,7 +101,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.rule.group" id="rule_group_attendance_admin">
             <field name="name">Any attendance</field>
-            <field name="model" search="[('model', '=', 'attendance.line')]"/>
+            <field name="model">attendance.line</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
         </record>
@@ -144,7 +144,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_period_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'attendance.period')]"/>
+            <field name="model">attendance.period</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_period_companies">
@@ -197,7 +197,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sheet_line_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'attendance.sheet.line')]"/>
+            <field name="model">attendance.sheet.line</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_sheet_line_companies">
@@ -209,7 +209,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sheet_line">
             <field name="name">Own attendance sheet line</field>
-            <field name="model" search="[('model', '=', 'attendance.sheet.line')]"/>
+            <field name="model">attendance.sheet.line</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
             <field name="perm_read" eval="False"/>
@@ -223,7 +223,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.rule.group" id="rule_group_sheet_line_admin">
             <field name="name">Any attendance sheet line</field>
-            <field name="model" search="[('model', '=', 'attendance.sheet.line')]"/>
+            <field name="model">attendance.sheet.line</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
         </record>
@@ -261,7 +261,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sheet_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'attendance.sheet')]"/>
+            <field name="model">attendance.sheet</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_sheet_companies">
@@ -273,7 +273,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sheet">
             <field name="name">Own attendance sheet</field>
-            <field name="model" search="[('model', '=', 'attendance.sheet')]"/>
+            <field name="model">attendance.sheet</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
             <field name="perm_read" eval="False"/>
@@ -287,7 +287,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.rule.group" id="rule_group_sheet_admin">
             <field name="name">Any attendance sheet</field>
-            <field name="model" search="[('model', '=', 'attendance.sheet')]"/>
+            <field name="model">attendance.sheet</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
         </record>
diff --git a/modules/commission/commission.xml b/modules/commission/commission.xml
index 4378396ce1..a930a95c39 100644
--- a/modules/commission/commission.xml
+++ b/modules/commission/commission.xml
@@ -83,8 +83,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_agent_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'commission.agent')]"/>
+            <field name="model">commission.agent</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_agent_companies">
diff --git a/modules/commission/commission_reporting.xml b/modules/commission/commission_reporting.xml
index 058cbf16b0..a5b398a891 100644
--- a/modules/commission/commission_reporting.xml
+++ b/modules/commission/commission_reporting.xml
@@ -68,8 +68,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_agent_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'commission.reporting.agent')]"/>
+            <field name="model">commission.reporting.agent</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_agent_companies">
@@ -146,8 +145,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_agent_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'commission.reporting.agent.time_series')]"/>
+            <field name="model">commission.reporting.agent.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_agent_time_series_companies">
diff --git a/modules/company/ir.xml b/modules/company/ir.xml
index 98119f2f0b..58c03e9cda 100644
--- a/modules/company/ir.xml
+++ b/modules/company/ir.xml
@@ -28,7 +28,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sequence_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'ir.sequence')]"/>
+            <field name="model">ir.sequence</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_sequence_companies1">
@@ -44,7 +44,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sequence_strict_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'ir.sequence.strict')]"/>
+            <field name="model">ir.sequence.strict</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_sequence_strict_companies1">
diff --git a/modules/company/tests/test_module.py b/modules/company/tests/test_module.py
index 7b2a5909d0..f6be9ad7a4 100644
--- a/modules/company/tests/test_module.py
+++ b/modules/company/tests/test_module.py
@@ -131,14 +131,14 @@ class CompanyTestMixin:
         for fname, models in to_check.items():
             rules = Rule.search([
                     ('rule_group', 'where', [
-                            ('model.model', 'in', list(models)),
+                            ('model', 'in', list(models)),
                             ('global_p', '=', True),
                             ('perm_read', '=', True),
                             ]),
                     ('domain', '=', PYSONEncoder(sort_keys=True).encode(
                             [(fname, 'in', Eval('companies', []))])),
                     ])
-            with_rules = {r.rule_group.model.model for r in rules}
+            with_rules = {r.rule_group.model for r in rules}
             self.assertGreaterEqual(with_rules, models,
                 msg='Models %(models)s are missing a global rule '
                 'for field "%(field)s"' % {
diff --git a/modules/document_incoming/document.xml b/modules/document_incoming/document.xml
index 1ffca17d3a..d3901094c2 100644
--- a/modules/document_incoming/document.xml
+++ b/modules/document_incoming/document.xml
@@ -166,7 +166,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_document_incoming_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'document.incoming')]"/>
+            <field name="model">document.incoming</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_document_incoming_companies1">
diff --git a/modules/document_incoming_ocr/document.xml b/modules/document_incoming_ocr/document.xml
index 505c166d8e..791025ca7d 100644
--- a/modules/document_incoming_ocr/document.xml
+++ b/modules/document_incoming_ocr/document.xml
@@ -74,7 +74,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_document_incoming_ocr_service_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'document.incoming.ocr.service')]"/>
+            <field name="model">document.incoming.ocr.service</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_document_incoming_ocr_service_companies1">
diff --git a/modules/incoterm/party.xml b/modules/incoterm/party.xml
index d34f476cb8..041ed9b0cd 100644
--- a/modules/incoterm/party.xml
+++ b/modules/incoterm/party.xml
@@ -32,7 +32,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_party_incoterm_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'party.incoterm')]"/>
+            <field name="model">party.incoterm</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_party_incoterm_companies">
diff --git a/modules/product_price_list/price_list.xml b/modules/product_price_list/price_list.xml
index d7ec619b2e..4795b514d8 100644
--- a/modules/product_price_list/price_list.xml
+++ b/modules/product_price_list/price_list.xml
@@ -56,7 +56,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_price_list_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'product.price_list')]"/>
+            <field name="model">product.price_list</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_price_list_companies">
diff --git a/modules/production/production.xml b/modules/production/production.xml
index 642f544e33..57c5d3e6f9 100644
--- a/modules/production/production.xml
+++ b/modules/production/production.xml
@@ -206,7 +206,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_production_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'production')]"/>
+            <field name="model">production</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_production_companies">
diff --git a/modules/production_work/work.xml b/modules/production_work/work.xml
index 76d7242485..ba42c7ca8c 100644
--- a/modules/production_work/work.xml
+++ b/modules/production_work/work.xml
@@ -94,8 +94,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_work_center_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'production.work.center')]"/>
+            <field name="model">production.work.center</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_work_center_companies">
@@ -261,7 +260,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_work_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'production.work')]"/>
+            <field name="model">production.work</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_work_companies">
@@ -319,7 +318,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_work_cycle_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'production.work.cycle')]"/>
+            <field name="model">production.work.cycle</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_work_cycle_companies">
diff --git a/modules/project/work.xml b/modules/project/work.xml
index 3b518d7418..a96d8cba23 100644
--- a/modules/project/work.xml
+++ b/modules/project/work.xml
@@ -35,7 +35,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_work_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'project.work')]"/>
+            <field name="model">project.work</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_work_companies">
diff --git a/modules/purchase/purchase.xml b/modules/purchase/purchase.xml
index f6fb39a14b..a7f129aed4 100644
--- a/modules/purchase/purchase.xml
+++ b/modules/purchase/purchase.xml
@@ -567,7 +567,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_product_supplier_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'purchase.product_supplier')]"/>
+            <field name="model">purchase.product_supplier</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_product_supplier_companies">
@@ -652,7 +652,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_purchase_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'purchase.purchase')]"/>
+            <field name="model">purchase.purchase</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_purchase_companies">
diff --git a/modules/purchase/purchase_reporting.xml b/modules/purchase/purchase_reporting.xml
index 53a3fb948c..65a8ac56d7 100644
--- a/modules/purchase/purchase_reporting.xml
+++ b/modules/purchase/purchase_reporting.xml
@@ -52,7 +52,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_main_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'purchase.reporting.main')]"/>
+            <field name="model">purchase.reporting.main</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_main_companies">
@@ -125,7 +125,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_main_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'purchase.reporting.main.time_series')]"/>
+            <field name="model">purchase.reporting.main.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_main_time_series_companies">
@@ -199,7 +199,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_supplier_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'purchase.reporting.supplier')]"/>
+            <field name="model">purchase.reporting.supplier</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_supplier_companies">
@@ -276,7 +276,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_supplier_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'purchase.reporting.supplier.time_series')]"/>
+            <field name="model">purchase.reporting.supplier.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_supplier_time_series_companies">
@@ -351,7 +351,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_product_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'purchase.reporting.product')]"/>
+            <field name="model">purchase.reporting.product</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_product_companies">
@@ -427,7 +427,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_product_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'purchase.reporting.product.time_series')]"/>
+            <field name="model">purchase.reporting.product.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_product_time_series_companies">
diff --git a/modules/purchase_amendment/purchase.xml b/modules/purchase_amendment/purchase.xml
index c4e395ed13..eb53be59e4 100644
--- a/modules/purchase_amendment/purchase.xml
+++ b/modules/purchase_amendment/purchase.xml
@@ -86,7 +86,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_purchase_amendment_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'purchase.amendment')]"/>
+            <field name="model">purchase.amendment</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_purchase_amendment_companies">
diff --git a/modules/purchase_blanket_agreement/purchase.xml b/modules/purchase_blanket_agreement/purchase.xml
index 59ba9710b1..60bb30ff7b 100644
--- a/modules/purchase_blanket_agreement/purchase.xml
+++ b/modules/purchase_blanket_agreement/purchase.xml
@@ -146,7 +146,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_purchase_blanket_agreement_companies">
             <field name="name">Purchases Blanket Agreement</field>
-            <field name="model" search="[('model', '=', 'purchase.blanket_agreement')]"/>
+            <field name="model">purchase.blanket_agreement</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_purchase_blanket_agreement_companies">
diff --git a/modules/purchase_request/purchase_request.xml b/modules/purchase_request/purchase_request.xml
index 952d02f84b..1bc61c86e4 100644
--- a/modules/purchase_request/purchase_request.xml
+++ b/modules/purchase_request/purchase_request.xml
@@ -131,7 +131,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_purchase_request_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'purchase.request')]"/>
+            <field name="model">purchase.request</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_purchase_request_companies">
diff --git a/modules/purchase_request_quotation/purchase.xml b/modules/purchase_request_quotation/purchase.xml
index 077022b15d..53cf72333d 100644
--- a/modules/purchase_request_quotation/purchase.xml
+++ b/modules/purchase_request_quotation/purchase.xml
@@ -118,8 +118,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_request_quotation_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'purchase.request.quotation')]"/>
+            <field name="model">purchase.request.quotation</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_request_quotation_companies">
diff --git a/modules/purchase_requisition/purchase.xml b/modules/purchase_requisition/purchase.xml
index e5e8287ba9..0c02c1f2de 100644
--- a/modules/purchase_requisition/purchase.xml
+++ b/modules/purchase_requisition/purchase.xml
@@ -224,7 +224,7 @@ this repository contains the full copyright notices and license terms.
 
         <record model="ir.rule.group" id="rule_group_requisition_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'purchase.requisition')]"/>
+            <field name="model">purchase.requisition</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_requisition_companies">
@@ -237,8 +237,7 @@ this repository contains the full copyright notices and license terms.
 
         <record model="ir.rule.group" id="rule_group_requisition_employees">
             <field name="name">Own requisition</field>
-            <field name="model"
-                search="[('model', '=', 'purchase.requisition')]"/>
+            <field name="model">purchase.requisition</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
             <field name="perm_read" eval="False"/>
@@ -258,8 +257,7 @@ this repository contains the full copyright notices and license terms.
         <!-- Give access to user who could trigger requisition work-flow -->
         <record model="ir.rule.group" id="rule_group_requisition_admin">
             <field name="name">Any requisition</field>
-            <field name="model"
-                search="[('model', '=', 'purchase.requisition')]"/>
+            <field name="model">purchase.requisition</field>
             <field name="global_p" eval="False"/>
         </record>
         <record model="ir.rule.group-res.group"
diff --git a/modules/quality/quality.xml b/modules/quality/quality.xml
index eeaaa133f7..5a2906469f 100644
--- a/modules/quality/quality.xml
+++ b/modules/quality/quality.xml
@@ -158,7 +158,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_quality_control_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'quality.control')]"/>
+            <field name="model">quality.control</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_quality_control_companies">
@@ -274,7 +274,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_quality_inspection_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'quality.inspection')]"/>
+            <field name="model">quality.inspection</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_quality_inspection_companies">
diff --git a/modules/sale/sale.xml b/modules/sale/sale.xml
index 702253e58e..b53541603b 100644
--- a/modules/sale/sale.xml
+++ b/modules/sale/sale.xml
@@ -287,7 +287,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sale_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.sale')]"/>
+            <field name="model">sale.sale</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_sale_companies">
diff --git a/modules/sale/sale_reporting.xml b/modules/sale/sale_reporting.xml
index cebbf84ed9..47afdbf4b5 100644
--- a/modules/sale/sale_reporting.xml
+++ b/modules/sale/sale_reporting.xml
@@ -60,7 +60,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_main_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.main')]"/>
+            <field name="model">sale.reporting.main</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_main_companies">
@@ -133,7 +133,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_main_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.main.time_series')]"/>
+            <field name="model">sale.reporting.main.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_main_time_series_companies">
@@ -219,7 +219,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_customer_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.customer')]"/>
+            <field name="model">sale.reporting.customer</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_customer_companies">
@@ -296,7 +296,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_customer_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.customer.time_series')]"/>
+            <field name="model">sale.reporting.customer.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_customer_time_series_companies">
@@ -377,7 +377,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_customer_category_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.customer.category')]"/>
+            <field name="model">sale.reporting.customer.category</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_customer_category_companies">
@@ -454,7 +454,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_customer_category_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.customer.category.time_series')]"/>
+            <field name="model">sale.reporting.customer.category.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_customer_category_time_series_companies">
@@ -540,7 +540,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_product_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.product')]"/>
+            <field name="model">sale.reporting.product</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_product_companies">
@@ -616,7 +616,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_product_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.product.time_series')]"/>
+            <field name="model">sale.reporting.product.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_product_time_series_companies">
@@ -697,7 +697,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_product_category_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.product.category')]"/>
+            <field name="model">sale.reporting.product.category</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_product_category_companies">
@@ -774,7 +774,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_product_category_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.product.category.time_series')]"/>
+            <field name="model">sale.reporting.product.category.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_product_category_time_series_companies">
@@ -858,7 +858,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_country_tree_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.country.tree')]"/>
+            <field name="model">sale.reporting.country.tree</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_country_tree_companies">
@@ -929,7 +929,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_country_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.country.time_series')]"/>
+            <field name="model">sale.reporting.country.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_country_time_series_companies">
@@ -1001,7 +1001,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_country_subdivision_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.reporting.country.subdivision.time_series')]"/>
+            <field name="model">sale.reporting.country.subdivision.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_country_subdivision_time_series_companies">
diff --git a/modules/sale_amendment/sale.xml b/modules/sale_amendment/sale.xml
index 5b197d0fad..0c544c7cd9 100644
--- a/modules/sale_amendment/sale.xml
+++ b/modules/sale_amendment/sale.xml
@@ -86,7 +86,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sale_amendment_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.amendment')]"/>
+            <field name="model">sale.amendment</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_sale_amendment_companies">
diff --git a/modules/sale_blanket_agreement/sale.xml b/modules/sale_blanket_agreement/sale.xml
index 4460ac85c1..c1b31cb7f0 100644
--- a/modules/sale_blanket_agreement/sale.xml
+++ b/modules/sale_blanket_agreement/sale.xml
@@ -146,7 +146,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sale_blanket_agreement_companies">
             <field name="name">Sales Blanket Agreement</field>
-            <field name="model" search="[('model', '=', 'sale.blanket_agreement')]"/>
+            <field name="model">sale.blanket_agreement</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_sale_blanket_agreement_companies">
diff --git a/modules/sale_complaint/complaint.xml b/modules/sale_complaint/complaint.xml
index d7a6b4b8c4..ba495b830d 100644
--- a/modules/sale_complaint/complaint.xml
+++ b/modules/sale_complaint/complaint.xml
@@ -179,7 +179,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_complaint_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.complaint')]"/>
+            <field name="model">sale.complaint</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_complaint_companies">
diff --git a/modules/sale_extra/sale.xml b/modules/sale_extra/sale.xml
index 535ee03022..8eeee4f6fb 100644
--- a/modules/sale_extra/sale.xml
+++ b/modules/sale_extra/sale.xml
@@ -57,7 +57,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_extra_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.extra')]"/>
+            <field name="model">sale.extra</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_extra_companies">
diff --git a/modules/sale_gift_card/sale.xml b/modules/sale_gift_card/sale.xml
index 8d362ec18a..62788a2ec3 100644
--- a/modules/sale_gift_card/sale.xml
+++ b/modules/sale_gift_card/sale.xml
@@ -95,7 +95,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_gift_card_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.gift_card')]"/>
+            <field name="model">sale.gift_card</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_gift_card_companies">
diff --git a/modules/sale_opportunity/opportunity.xml b/modules/sale_opportunity/opportunity.xml
index 39ce051b8b..44119d4065 100644
--- a/modules/sale_opportunity/opportunity.xml
+++ b/modules/sale_opportunity/opportunity.xml
@@ -187,7 +187,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_opportunity_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
+            <field name="model">sale.opportunity</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_opportunity_companies">
diff --git a/modules/sale_opportunity/opportunity_reporting.xml b/modules/sale_opportunity/opportunity_reporting.xml
index acbc573da6..b669805e6a 100644
--- a/modules/sale_opportunity/opportunity_reporting.xml
+++ b/modules/sale_opportunity/opportunity_reporting.xml
@@ -54,7 +54,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_main_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.opportunity.reporting.main')]"/>
+            <field name="model">sale.opportunity.reporting.main</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_main_companies">
@@ -130,7 +130,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_main_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.opportunity.reporting.main.time_series')]"/>
+            <field name="model">sale.opportunity.reporting.main.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_main_time_series_companies">
@@ -195,7 +195,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_conversion_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.opportunity.reporting.conversion')]"/>
+            <field name="model">sale.opportunity.reporting.conversion</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_conversion_companies">
@@ -271,7 +271,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_conversion_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.opportunity.reporting.conversion.time_series')]"/>
+            <field name="model">sale.opportunity.reporting.conversion.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_conversion_time_series_companies">
@@ -354,7 +354,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_conversion_employee_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.opportunity.reporting.conversion.employee')]"/>
+            <field name="model">sale.opportunity.reporting.conversion.employee</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_conversion_employee_companies">
@@ -432,7 +432,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_conversion_employee_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.opportunity.reporting.conversion.employee.time_series')]"/>
+            <field name="model">sale.opportunity.reporting.conversion.employee.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_conversion_employee_time_series_companies">
diff --git a/modules/sale_point/sale.xml b/modules/sale_point/sale.xml
index ffae0b0282..3bd43b24a8 100644
--- a/modules/sale_point/sale.xml
+++ b/modules/sale_point/sale.xml
@@ -91,7 +91,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_point_sale_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.point')]"/>
+            <field name="model">sale.point</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_point_sale_companies">
@@ -208,7 +208,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sale_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.point.sale')]"/>
+            <field name="model">sale.point.sale</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_sale_companies">
@@ -321,7 +321,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_cash_session_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.point.sale')]"/>
+            <field name="model">sale.point.sale</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_cash_session_companies">
@@ -381,7 +381,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_payment_method_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.point.payment.method')]"/>
+            <field name="model">sale.point.payment.method</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_payment_method_companies">
@@ -455,7 +455,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_cash_transfer_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.point.cash.transfer')]"/>
+            <field name="model">sale.point.cash.transfer</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_cash_transfer_companies">
@@ -516,7 +516,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_cash_transfer_type_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.point.cash.transfer.type')]"/>
+            <field name="model">sale.point.cash.transfer.type</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_cash_transfer_type_companies">
diff --git a/modules/sale_promotion/sale.xml b/modules/sale_promotion/sale.xml
index e762bf9434..fd187e5068 100644
--- a/modules/sale_promotion/sale.xml
+++ b/modules/sale_promotion/sale.xml
@@ -55,7 +55,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_promotion_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.promotion')]"/>
+            <field name="model">sale.promotion</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_promotion_companies">
diff --git a/modules/sale_subscription/subscription.xml b/modules/sale_subscription/subscription.xml
index 7964de80b8..effbf4cb90 100644
--- a/modules/sale_subscription/subscription.xml
+++ b/modules/sale_subscription/subscription.xml
@@ -95,7 +95,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_subscription_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'sale.subscription')]"/>
+            <field name="model">sale.subscription</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_subscription_companies">
diff --git a/modules/sale_supply_drop_shipment/stock.xml b/modules/sale_supply_drop_shipment/stock.xml
index 126f61c9d1..48c4221f39 100644
--- a/modules/sale_supply_drop_shipment/stock.xml
+++ b/modules/sale_supply_drop_shipment/stock.xml
@@ -177,8 +177,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_shipment_drop_companies">
             <field name="name">User in companies</field>
-            <field name="model"
-                search="[('model', '=', 'stock.shipment.drop')]"/>
+            <field name="model">stock.shipment.drop</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_shipment_drop_companies">
diff --git a/modules/stock/inventory.xml b/modules/stock/inventory.xml
index 91e5181e7e..c237d3abaf 100644
--- a/modules/stock/inventory.xml
+++ b/modules/stock/inventory.xml
@@ -86,7 +86,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_inventory_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.inventory')]"/>
+            <field name="model">stock.inventory</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_inventory_companies">
diff --git a/modules/stock/move.xml b/modules/stock/move.xml
index 721b24e1da..e3ca9cb334 100644
--- a/modules/stock/move.xml
+++ b/modules/stock/move.xml
@@ -96,7 +96,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_move_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.move')]"/>
+            <field name="model">stock.move</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_move_companies">
diff --git a/modules/stock/period.xml b/modules/stock/period.xml
index 0496ad7a58..afe7a4d686 100644
--- a/modules/stock/period.xml
+++ b/modules/stock/period.xml
@@ -36,7 +36,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_period_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.period')]"/>
+            <field name="model">stock.period</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_period_companies">
diff --git a/modules/stock/product.xml b/modules/stock/product.xml
index 10fabfe779..e6772bf53d 100644
--- a/modules/stock/product.xml
+++ b/modules/stock/product.xml
@@ -79,7 +79,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_product_cost_price_revision_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'product.cost_price.revision')]"/>
+            <field name="model">product.cost_price.revision</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_product_cost_price_revision_companies">
@@ -283,7 +283,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_product_quantities_warehouse_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.product_quantities_warehouse')]"/>
+            <field name="model">stock.product_quantities_warehouse</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_product_quantities_warehouse_companies">
@@ -384,7 +384,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_product_quantities_warehouse_move_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.product_quantities_warehouse.move')]"/>
+            <field name="model">stock.product_quantities_warehouse.move</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_product_quantities_warehouse_move_companies">
diff --git a/modules/stock/shipment.xml b/modules/stock/shipment.xml
index 66ed2c4675..4052f2cafe 100644
--- a/modules/stock/shipment.xml
+++ b/modules/stock/shipment.xml
@@ -862,7 +862,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_shipment_in_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.shipment.in')]"/>
+            <field name="model">stock.shipment.in</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_shipment_in_companies">
@@ -874,7 +874,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_shipment_in_return_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.shipment.in.return')]"/>
+            <field name="model">stock.shipment.in.return</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_shipment_in_return_companies">
@@ -886,7 +886,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_shipment_out_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.shipment.out')]"/>
+            <field name="model">stock.shipment.out</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_shipment_out_companies">
@@ -898,7 +898,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_shipment_out_return_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.shipment.out.return')]"/>
+            <field name="model">stock.shipment.out.return</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_shipment_out_return_companies">
@@ -910,7 +910,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_shipment_internal_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.shipment.internal')]"/>
+            <field name="model">stock.shipment.internal</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_shipment_internal_companies">
diff --git a/modules/stock/stock_reporting_margin.xml b/modules/stock/stock_reporting_margin.xml
index 732574a47f..eb28a98fe2 100644
--- a/modules/stock/stock_reporting_margin.xml
+++ b/modules/stock/stock_reporting_margin.xml
@@ -79,7 +79,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_margin_main_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.reporting.margin.main')]"/>
+            <field name="model">stock.reporting.margin.main</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_margin_main_companies">
@@ -163,7 +163,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_margin_main_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.reporting.margin.main.time_series')]"/>
+            <field name="model">stock.reporting.margin.main.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_margin_main_time_series_companies">
@@ -252,7 +252,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_margin_product_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.reporting.margin.product')]"/>
+            <field name="model">stock.reporting.margin.product</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_margin_product_companies">
@@ -341,7 +341,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_margin_product_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.reporting.margin.product.time_series')]"/>
+            <field name="model">stock.reporting.margin.product.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_margin_product_time_series_companies">
@@ -474,7 +474,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_margin_category_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.reporting.margin.category')]"/>
+            <field name="model">stock.reporting.margin.category</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_margin_category_companies">
@@ -562,7 +562,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_reporting_margin_category_time_series_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.reporting.margin.category.time_series')]"/>
+            <field name="model">stock.reporting.margin.category.time_series</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_reporting_margin_category_time_series_companies">
diff --git a/modules/stock_forecast/forecast.xml b/modules/stock_forecast/forecast.xml
index f439b5d422..fd0b44dcdc 100644
--- a/modules/stock_forecast/forecast.xml
+++ b/modules/stock_forecast/forecast.xml
@@ -88,7 +88,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_forecast_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.forecast')]"/>
+            <field name="model">stock.forecast</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_forecast_companies">
diff --git a/modules/stock_location_move/stock.xml b/modules/stock_location_move/stock.xml
index 9ef015fb9b..1eb45a7d37 100644
--- a/modules/stock_location_move/stock.xml
+++ b/modules/stock_location_move/stock.xml
@@ -23,7 +23,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_location_movable">
             <field name="name">Movable location</field>
-            <field name="model" search="[('model', '=', 'stock.location')]"/>
+            <field name="model">stock.location</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
             <field name="perm_read" eval="False"/>
@@ -43,7 +43,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_location_movable_admin">
             <field name="name">Any location</field>
-            <field name="model" search="[('model', '=', 'stock.location')]"/>
+            <field name="model">stock.location</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
             <field name="perm_read" eval="True"/>
diff --git a/modules/stock_lot/stock.xml b/modules/stock_lot/stock.xml
index 68511afcfe..e43ecdf69a 100644
--- a/modules/stock_lot/stock.xml
+++ b/modules/stock_lot/stock.xml
@@ -154,7 +154,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_lot_trace_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.lot.trace')]"/>
+            <field name="model">stock.lot.trace</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_lot_trace_companies">
diff --git a/modules/stock_package/stock.xml b/modules/stock_package/stock.xml
index cb71812ced..ca6a2a7949 100644
--- a/modules/stock_package/stock.xml
+++ b/modules/stock_package/stock.xml
@@ -49,7 +49,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_package_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.package')]"/>
+            <field name="model">stock.package</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_package_companies">
diff --git a/modules/stock_quantity_early_planning/stock.xml b/modules/stock_quantity_early_planning/stock.xml
index 7a26e75a1b..ebf4aa8e64 100644
--- a/modules/stock_quantity_early_planning/stock.xml
+++ b/modules/stock_quantity_early_planning/stock.xml
@@ -74,7 +74,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_quantity_early_plan_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.quantity.early_plan')]"/>
+            <field name="model">stock.quantity.early_plan</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_quantity_early_plan_companies">
diff --git a/modules/stock_quantity_issue/stock.xml b/modules/stock_quantity_issue/stock.xml
index 899b493383..be4f3e0719 100644
--- a/modules/stock_quantity_issue/stock.xml
+++ b/modules/stock_quantity_issue/stock.xml
@@ -74,7 +74,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_quantity_issue_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.quantity.issue')]"/>
+            <field name="model">stock.quantity.issue</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_quantity_issue_companies">
diff --git a/modules/stock_supply/order_point.xml b/modules/stock_supply/order_point.xml
index d6bfac5166..a68755b7ee 100644
--- a/modules/stock_supply/order_point.xml
+++ b/modules/stock_supply/order_point.xml
@@ -72,7 +72,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_order_point_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'stock.order_point')]"/>
+            <field name="model">stock.order_point</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_order_point_companies">
diff --git a/modules/timesheet/line.xml b/modules/timesheet/line.xml
index 31855da6db..da6ec855ce 100644
--- a/modules/timesheet/line.xml
+++ b/modules/timesheet/line.xml
@@ -62,7 +62,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_line_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'timesheet.line')]"/>
+            <field name="model">timesheet.line</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_line_companies">
@@ -74,7 +74,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_line">
             <field name="name">Own timesheet line</field>
-            <field name="model" search="[('model', '=', 'timesheet.line')]"/>
+            <field name="model">timesheet.line</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
             <field name="perm_read" eval="False"/>
@@ -87,7 +87,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.rule.group" id="rule_group_line_admin">
             <field name="name">Any timesheet line</field>
-            <field name="model" search="[('model', '=', 'timesheet.line')]"/>
+            <field name="model">timesheet.line</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
         </record>
@@ -148,7 +148,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_hours_employees">
             <field name="name">Own hours</field>
-            <field name="model" search="[('model', '=', 'timesheet.hours_employee')]"/>
+            <field name="model">timesheet.hours_employee</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
         </record>
@@ -160,7 +160,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.rule.group" id="rule_group_hours_supervised_employees">
             <field name="name">Supervised employee's hours</field>
-            <field name="model" search="[('model', '=', 'timesheet.hours_employee')]"/>
+            <field name="model">timesheet.hours_employee</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
         </record>
@@ -173,7 +173,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_hours_employee_admin">
             <field name="name">Any employee hours</field>
-            <field name="model" search="[('model', '=', 'timesheet.hours_employee')]"/>
+            <field name="model">timesheet.hours_employee</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
         </record>
@@ -212,7 +212,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_hours_employee_weekly">
             <field name="name">Own hours</field>
-            <field name="model" search="[('model', '=', 'timesheet.hours_employee_weekly')]"/>
+            <field name="model">timesheet.hours_employee_weekly</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
         </record>
@@ -224,7 +224,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.rule.group" id="rule_group_hours_supervised_employees_weekly">
             <field name="name">Supervised employee's hours</field>
-            <field name="model" search="[('model', '=', 'timesheet.hours_employee_weekly')]"/>
+            <field name="model">timesheet.hours_employee_weekly</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
         </record>
@@ -237,7 +237,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_hours_employee_weekly_admin">
             <field name="name">Any employee hours</field>
-            <field name="model" search="[('model', '=', 'timesheet.hours_employee_weekly')]"/>
+            <field name="model">timesheet.hours_employee_weekly</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
         </record>
@@ -270,7 +270,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_hours_employee_monthly">
             <field name="name">Own hours</field>
-            <field name="model" search="[('model', '=', 'timesheet.hours_employee_monthly')]"/>
+            <field name="model">timesheet.hours_employee_monthly</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
         </record>
@@ -282,7 +282,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.rule.group" id="rule_group_hours_supervised_employees_monthly">
             <field name="name">Supervised employee's hours</field>
-            <field name="model" search="[('model', '=', 'timesheet.hours_employee_monthly')]"/>
+            <field name="model">timesheet.hours_employee_monthly</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
         </record>
@@ -295,7 +295,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_hours_employee_monthly_admin">
             <field name="name">Any employee hours</field>
-            <field name="model" search="[('model', '=', 'timesheet.hours_employee_monthly')]"/>
+            <field name="model">timesheet.hours_employee_monthly</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
         </record>
diff --git a/modules/timesheet/work.xml b/modules/timesheet/work.xml
index 43a9ebd114..2e876d9729 100644
--- a/modules/timesheet/work.xml
+++ b/modules/timesheet/work.xml
@@ -104,7 +104,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_work_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'timesheet.work')]"/>
+            <field name="model">timesheet.work</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_work_companies">
diff --git a/modules/web_shop/web.xml b/modules/web_shop/web.xml
index 85333538b5..7c67fcf74a 100644
--- a/modules/web_shop/web.xml
+++ b/modules/web_shop/web.xml
@@ -38,7 +38,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_shop_companies">
             <field name="name">User in companies</field>
-            <field name="model" search="[('model', '=', 'web.shop')]"/>
+            <field name="model">web.shop</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_shop_companies">
diff --git a/trytond/CHANGELOG b/trytond/CHANGELOG
index 463417c0f6..03c50504e7 100644
--- a/trytond/CHANGELOG
+++ b/trytond/CHANGELOG
@@ -1,3 +1,4 @@
+* Store model on ir.rule.group
 * Store model on ir.model.button
 * Store model and field name on ir.model.field.access
 * Store model name on ir.model.access
diff --git a/trytond/trytond/ir/rule.py b/trytond/trytond/ir/rule.py
index 96723d4cc4..cbce7e4272 100644
--- a/trytond/trytond/ir/rule.py
+++ b/trytond/trytond/ir/rule.py
@@ -17,14 +17,17 @@ class DomainError(ValidationError):
     pass
 
 
-class RuleGroup(ModelSQL, ModelView):
+class RuleGroup(
+        fields.fmany2one(
+            'model_ref', 'model', 'ir.model,model', "Model",
+            required=True, ondelete='CASCADE'),
+        ModelSQL, ModelView):
     "Rule group"
     __name__ = 'ir.rule.group'
     name = fields.Char(
         "Name", translate=True, required=True,
         help="Displayed to users when access error is raised for this rule.")
-    model = fields.Many2One('ir.model', 'Model',
-        required=True, ondelete='CASCADE')
+    model = fields.Char("Model", required=True)
     global_p = fields.Boolean('Global',
         help="Make the rule global \nso every users must follow this rule.")
     default_p = fields.Boolean('Default',
@@ -55,6 +58,29 @@ class RuleGroup(ModelSQL, ModelView):
                 Index(t, (t.model, Index.Equality())),
                 })
 
+    @classmethod
+    def __register__(cls, module):
+        pool = Pool()
+        Model = pool.get('ir.model')
+        transaction = Transaction()
+        cursor = transaction.connection.cursor()
+        table_h = cls.__table_handler__(module)
+        table = cls.__table__()
+        model = Model.__table__()
+
+        # Migration from 7.0: model as char
+        if (table_h.column_exist('model')
+                and table_h.column_is_type('model', 'INTEGER')):
+            table_h.column_rename('model', '_temp_model')
+            table_h.add_column('model', 'VARCHAR')
+            cursor.execute(*table.update(
+                    [table.model], [model.model],
+                    from_=[model],
+                    where=table._temp_model == model.id))
+            table_h.drop_column('_temp_model')
+
+        super().__register__(module)
+
     @staticmethod
     def default_global_p():
         return True
@@ -130,7 +156,7 @@ class Rule(ModelSQL, ModelView):
         if field_names and 'domain' not in field_names:
             return
         for rule in rules:
-            ctx = cls._get_context(rule.rule_group.model.model)
+            ctx = cls._get_context(rule.rule_group.model)
             try:
                 value = PYSONDecoder(ctx).decode(rule.domain)
             except Exception:
@@ -166,13 +192,11 @@ class Rule(ModelSQL, ModelView):
         "Return dictionary of non-global and global rules"
         pool = Pool()
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
         RuleGroup_Group = pool.get('ir.rule.group-res.group')
         User = pool.get('res.user')
         rule_table = cls.__table__()
         rule_group = RuleGroup.__table__()
         rule_group_group = RuleGroup_Group.__table__()
-        model = Model.__table__()
         transaction = Transaction()
 
         assert mode in cls.modes
@@ -204,12 +228,10 @@ class Rule(ModelSQL, ModelView):
             return {}, {}
         cursor.execute(*rule_table.join(rule_group,
                 condition=rule_group.id == rule_table.rule_group
-                ).join(model,
-                condition=rule_group.model == model.id
                 ).join(rule_group_group, 'LEFT',
                 condition=rule_group_group.rule_group == rule_group.id
                 ).select(rule_table.id,
-                where=(model.model.in_(model_names))
+                where=(rule_group.model.in_(model_names))
                 & (getattr(rule_group, 'perm_%s' % mode) == Literal(True))
                 & (rule_group_group.group.in_(groups or [-1])
                     | (rule_group.default_p == Literal(True))
@@ -218,12 +240,10 @@ class Rule(ModelSQL, ModelView):
         ids = [x for x, in cursor]
 
         # Test if there is no rule_group that have no rule
-        cursor.execute(*rule_group.join(model,
-                condition=rule_group.model == model.id
-                ).join(rule_group_group, 'LEFT',
+        cursor.execute(*rule_group.join(rule_group_group, 'LEFT',
                 condition=rule_group_group.rule_group == rule_group.id
                 ).select(rule_group.id,
-                where=(model.model.in_(model_names))
+                where=(rule_group.model.in_(model_names))
                 & ~rule_group.id.in_(rule_table.select(rule_table.rule_group))
                 & rule_group_group.group.in_(groups or [-1])))
         no_rules = cursor.fetchone()
@@ -235,11 +255,11 @@ class Rule(ModelSQL, ModelView):
             rules = cls.browse(ids)
         for rule in rules:
             decoder = PYSONDecoder(
-                cls._get_context(rule.rule_group.model.model))
+                cls._get_context(rule.rule_group.model))
             assert rule.domain, ('Rule domain empty,'
                 'check if migration was done')
             dom = decoder.decode(rule.domain)
-            target_model = rule.rule_group.model.model
+            target_model = rule.rule_group.model
             if target_model in model2field:
                 target_dom = ['OR']
                 for field in model2field[target_model]:
diff --git a/trytond/trytond/ir/view/rule_group_form.xml b/trytond/trytond/ir/view/rule_group_form.xml
index 7162215af9..cff058f063 100644
--- a/trytond/trytond/ir/view/rule_group_form.xml
+++ b/trytond/trytond/ir/view/rule_group_form.xml
@@ -2,8 +2,8 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <form col="6">
-    <label name="model"/>
-    <field name="model"/>
+    <label name="model_ref"/>
+    <field name="model_ref"/>
     <label name="global_p"/>
     <field name="global_p"/>
     <label name="default_p"/>
diff --git a/trytond/trytond/ir/view/rule_group_list.xml b/trytond/trytond/ir/view/rule_group_list.xml
index e8d6988f25..823000bafd 100644
--- a/trytond/trytond/ir/view/rule_group_list.xml
+++ b/trytond/trytond/ir/view/rule_group_list.xml
@@ -6,7 +6,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="perm_write"/>
     <field name="perm_create"/>
     <field name="perm_delete"/>
-    <field name="model" expand="1"/>
+    <field name="model_ref" expand="1"/>
     <field name="name" expand="1"/>
     <field name="global_p"/>
     <field name="default_p"/>
diff --git a/trytond/trytond/res/ir.xml b/trytond/trytond/res/ir.xml
index e08597bb0e..400167ea49 100644
--- a/trytond/trytond/res/ir.xml
+++ b/trytond/trytond/res/ir.xml
@@ -237,7 +237,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_menu">
             <field name="name">User in groups</field>
-            <field name="model" search="[('model', '=', 'ir.ui.menu')]"/>
+            <field name="model">ir.ui.menu</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_menu1">
@@ -252,7 +252,7 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.rule.group" id="rule_group_action">
             <field name="name">User in groups</field>
-            <field name="model" search="[('model', '=', 'ir.action')]"/>
+            <field name="model">ir.action</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_action1">
@@ -342,7 +342,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sequence">
             <field name="name">User in groups</field>
-            <field name="model" search="[('model', '=', 'ir.sequence')]"/>
+            <field name="model">ir.sequence</field>
             <field name="global_p" eval="True"/>
             <field name="perm_read" eval="False"/>
         </record>
@@ -355,7 +355,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_sequence_strict">
             <field name="name">User in groups</field>
-            <field name="model" search="[('model', '=', 'ir.sequence.strict')]"/>
+            <field name="model">ir.sequence.strict</field>
             <field name="global_p" eval="True"/>
             <field name="perm_read" eval="False"/>
         </record>
diff --git a/trytond/trytond/res/user.xml b/trytond/trytond/res/user.xml
index b12dd955b2..a71da8a23e 100644
--- a/trytond/trytond/res/user.xml
+++ b/trytond/trytond/res/user.xml
@@ -106,7 +106,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_user_warning">
             <field name="name">Own warning</field>
-            <field name="model" search="[('model', '=', 'res.user.warning')]"/>
+            <field name="model">res.user.warning</field>
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_user_warning1">
@@ -128,8 +128,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_user_application">
             <field name="name">Own user application</field>
-            <field name="model"
-                search="[('model', '=', 'res.user.application')]"/>
+            <field name="model">res.user.application</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="True"/>
         </record>
@@ -140,8 +139,7 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.rule.group" id="rule_group_user_application_admin">
             <field name="name">Any user application</field>
-            <field name="model"
-                search="[('model', '=', 'res.user.application')]"/>
+            <field name="model">res.user.application</field>
             <field name="global_p" eval="False"/>
             <field name="default_p" eval="False"/>
         </record>
diff --git a/trytond/trytond/tests/test_rule.py b/trytond/trytond/tests/test_rule.py
index d407254d61..120c40c7ea 100644
--- a/trytond/trytond/tests/test_rule.py
+++ b/trytond/trytond/tests/test_rule.py
@@ -31,12 +31,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': True,
@@ -56,12 +54,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': True,
@@ -82,12 +78,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': False,
                     'default_p': True,
                     'perm_read': False,
@@ -119,12 +113,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -145,12 +137,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -172,12 +162,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -209,12 +197,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -235,12 +221,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -272,12 +256,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': True,
                     'perm_create': False,
@@ -298,12 +280,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': True,
                     'perm_create': False,
@@ -325,12 +305,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': True,
                     'perm_create': False,
@@ -362,12 +340,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': True,
                     'perm_create': False,
@@ -388,12 +364,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': True,
                     'perm_create': False,
@@ -424,12 +398,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -451,12 +423,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -479,12 +449,10 @@ class ModelRuleTestCase(unittest.TestCase):
         TestRule = pool.get('test.rule')
         TestRuleRelation = pool.get('test.rule.relation')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -508,12 +476,10 @@ class ModelRuleTestCase(unittest.TestCase):
         TestRule = pool.get('test.rule')
         TestRuleRelation = pool.get('test.rule.relation')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -546,12 +512,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -573,12 +537,10 @@ class ModelRuleTestCase(unittest.TestCase):
         pool = Pool()
         TestRule = pool.get('test.rule')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -601,12 +563,10 @@ class ModelRuleTestCase(unittest.TestCase):
         TestRule = pool.get('test.rule')
         TestRuleRelation = pool.get('test.rule.relation')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -630,12 +590,10 @@ class ModelRuleTestCase(unittest.TestCase):
         TestRule = pool.get('test.rule')
         TestRuleRelation = pool.get('test.rule.relation')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': False,
                     'perm_create': False,
@@ -659,12 +617,10 @@ class ModelRuleTestCase(unittest.TestCase):
         TestRule = pool.get('test.rule')
         TestRuleModel = pool.get('test.rule.model')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': True,
                     'perm_create': False,
@@ -687,12 +643,10 @@ class ModelRuleTestCase(unittest.TestCase):
         TestRule = pool.get('test.rule')
         TestRuleModel = pool.get('test.rule.model')
         RuleGroup = pool.get('ir.rule.group')
-        Model = pool.get('ir.model')
 
-        model, = Model.search([('model', '=', 'test.rule')])
         rule_group, = RuleGroup.create([{
                     'name': "Field different from foo",
-                    'model': model.id,
+                    'model': TestRule.__name__,
                     'global_p': True,
                     'perm_read': True,
                     'perm_create': False,