diff --git a/account.xml b/account.xml
index 1664a5df78..1c4951a841 100644
--- a/account.xml
+++ b/account.xml
@@ -800,9 +800,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_account1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'account.account')]"/>
-            <field name="operator">in</field>
-            <field name="operand">User/Current Companies</field>
+            <field name="domain">[('company', 'in', [c.id for c in user.companies])]</field>
             <field name="rule_group" ref="rule_group_account"/>
         </record>
 
diff --git a/fiscalyear.xml b/fiscalyear.xml
index e5bf1018ec..30a0d9663b 100644
--- a/fiscalyear.xml
+++ b/fiscalyear.xml
@@ -101,9 +101,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_fiscalyear1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'account.fiscalyear')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
+            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
             <field name="rule_group" ref="rule_group_fiscalyear"/>
         </record>
 
diff --git a/period.xml b/period.xml
index d65b1c53dc..9a81f44b0f 100644
--- a/period.xml
+++ b/period.xml
@@ -124,9 +124,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_period1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'account.period')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
+            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
             <field name="rule_group" ref="rule_group_period"/>
         </record>
     </data>
diff --git a/tax.xml b/tax.xml
index 6899664ade..6e0e086a2d 100644
--- a/tax.xml
+++ b/tax.xml
@@ -291,9 +291,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True" />
         </record>
         <record model="ir.rule" id="rule_tax_code1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'account.tax.code')]" />
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
+            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
             <field name="rule_group" ref="rule_group_tax_code" />
         </record>
 
@@ -560,9 +558,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_tax1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'account.tax')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
+            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
             <field name="rule_group" ref="rule_group_tax"/>
         </record>
 
@@ -767,9 +763,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_tax_rule1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'account.tax.rule')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
+            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
             <field name="rule_group" ref="rule_group_tax_rule"/>
         </record>