diff --git a/shipment.py b/shipment.py
index 8e0b5fa..f010051 100644
--- a/shipment.py
+++ b/shipment.py
@@ -63,7 +63,10 @@ class ExternalReception(Workflow, ModelSQL, ModelView):
                 Eval('context', {}).get('company', -1)),
             ])
     party = fields.Many2One('party.party', 'Party', required=True,
-        states=_STATES, depends=_DEPENDS)
+        context={
+            'company': Eval('company'),
+            },
+        states=_STATES, depends=_DEPENDS + ['company'])
     reference = fields.Char("Reference", size=None, select=True,
         states=_STATES, depends=_DEPENDS)
     warehouse = fields.Many2One('stock.location', "Warehouse",
diff --git a/shipment.xml b/shipment.xml
index 69d8fc5..ae10ec4 100644
--- a/shipment.xml
+++ b/shipment.xml
@@ -128,6 +128,18 @@
             <field name="perm_delete" eval="True"/>
         </record>
 
+        <record model="ir.rule.group" id="rule_group_stock_external_reception">
+            <field name="name">User in companies</field>
+            <field name="model" search="[('model', '=', 'stock.external.reception')]"/>
+            <field name="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_stock_external_reception1">
+            <field name="domain"
+                eval="[('company', 'in', Eval('companies', []))]"
+                pyson="1"/>
+            <field name="rule_group" ref="rule_group_stock_external_reception"/>
+        </record>
+
         <record model="ir.model.button" id="stock_external_reception_draft_button">
             <field name="name">draft</field>
             <field name="string">Draft</field>
@@ -228,17 +240,6 @@
             <field name="perm_delete" eval="True"/>
         </record>
 
-          <record model="ir.rule.group" id="rule_group_stock_external_reception">
-            <field name="name">Stock External Reception, User Company</field>
-            <field name="model" search="[('model', '=', 'stock.external.reception')]"/>
-            <field name="global_p" eval="True"/>
-        </record>
-
-        <record model="ir.rule" id="rule_stock_external_reception1">
-            <field name="domain" eval="[('company', '=', Eval('user', {}).get('company', None))]" pyson="1"/>
-            <field name="rule_group" ref="rule_group_stock_external_reception"/>
-        </record>
-
         <!-- Sequence -->
         <record model="ir.sequence.type" id="sequence_type_external_reception">
             <field name="name">External Reception</field>
diff --git a/tests/test_stock_external_reception.py b/tests/test_stock_external_reception.py
index 621eacf..ad026b6 100644
--- a/tests/test_stock_external_reception.py
+++ b/tests/test_stock_external_reception.py
@@ -7,9 +7,10 @@ import trytond.tests.test_tryton
 from trytond.tests.test_tryton import ModuleTestCase
 from trytond.tests.test_tryton import doctest_setup, doctest_teardown
 from trytond.tests.test_tryton import doctest_checker
+from trytond.modules.company.tests import CompanyTestMixin
 
 
-class TestCase(ModuleTestCase):
+class TestCase(CompanyTestMixin, ModuleTestCase):
     'Test module'
     module = 'stock_external_reception'