diff --git a/account.xml b/account.xml
index 0a3edc778f..7b0353a976 100644
--- a/account.xml
+++ b/account.xml
@@ -94,17 +94,17 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_create" eval="True"/>
             <field name="perm_delete" eval="True"/>
         </record>
-        <record model="ir.rule.group" id="rule_group_invoice_sequence">
-            <field name="name">User in company</field>
+        <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="global_p" eval="True"/>
         </record>
-        <record model="ir.rule" id="rule_invoice_sequence1">
+        <record model="ir.rule" id="rule_invoice_sequence_companies">
             <field name="domain"
-                eval="[('company', '=', Eval('user', {}).get('company', None))]"
+                eval="[('company', 'in', Eval('companies', []))]"
                 pyson="1"/>
-            <field name="rule_group" ref="rule_group_invoice_sequence"/>
+            <field name="rule_group" ref="rule_group_invoice_sequence_companies"/>
         </record>
 
     </data>
diff --git a/invoice.xml b/invoice.xml
index 32a02f85f1..e29ab166d1 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -347,6 +347,18 @@ this repository contains the full copyright notices and license terms. -->
             sequence="50"
             id="menu_payment_method_form"/>
 
+        <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="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_payment_method_companies">
+            <field name="domain"
+                eval="[('company', 'in', Eval('companies', []))]"
+                pyson="1"/>
+            <field name="rule_group" ref="rule_group_payment_method_companies"/>
+        </record>
+
         <record model="ir.model.access" id="access_payment_method">
             <field name="model" search="[('model', '=', 'account.invoice.payment.method')]"/>
             <field name="perm_read" eval="True"/>
@@ -380,28 +392,28 @@ this repository contains the full copyright notices and license terms. -->
             <field name="action" ref="credit"/>
         </record>
 
-        <record model="ir.rule.group" id="rule_group_invoice">
-            <field name="name">User in company</field>
+        <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="global_p" eval="True"/>
         </record>
-        <record model="ir.rule" id="rule_invoice1">
+        <record model="ir.rule" id="rule_invoice_companies">
             <field name="domain"
-                eval="[('company', '=', Eval('user', {}).get('company', None))]"
+                eval="[('company', 'in', Eval('companies', []))]"
                 pyson="1"/>
-            <field name="rule_group" ref="rule_group_invoice"/>
+            <field name="rule_group" ref="rule_group_invoice_companies"/>
         </record>
 
-        <record model="ir.rule.group" id="rule_group_invoice_line">
-            <field name="name">User in company</field>
+        <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="global_p" eval="True"/>
         </record>
-        <record model="ir.rule" id="rule_invoice_line1">
+        <record model="ir.rule" id="rule_invoice_line_companies">
             <field name="domain"
-                eval="[('company', '=', Eval('user', {}).get('company', None))]"
+                eval="[('company', 'in', Eval('companies', []))]"
                 pyson="1"/>
-            <field name="rule_group" ref="rule_group_invoice_line"/>
+            <field name="rule_group" ref="rule_group_invoice_line_companies"/>
         </record>
     </data>
 </tryton>
diff --git a/tests/test_account_invoice.py b/tests/test_account_invoice.py
index 458d1bd870..12691106f8 100644
--- a/tests/test_account_invoice.py
+++ b/tests/test_account_invoice.py
@@ -11,7 +11,7 @@ from trytond.tests.test_tryton import doctest_checker
 from trytond.pool import Pool
 
 from trytond.modules.company.tests import (
-    PartyCompanyCheckEraseMixin, CompanyMultiValueTestMixin)
+    PartyCompanyCheckEraseMixin, CompanyTestMixin)
 from trytond.modules.currency.tests import create_currency
 
 from ..exceptions import PaymentTermValidationError
@@ -41,8 +41,7 @@ def set_invoice_sequences(fiscalyear):
 
 
 class AccountInvoiceTestCase(
-        PartyCompanyCheckEraseMixin, CompanyMultiValueTestMixin,
-        ModuleTestCase):
+        PartyCompanyCheckEraseMixin, CompanyTestMixin, ModuleTestCase):
     'Test AccountInvoice module'
     module = 'account_invoice'