diff --git a/purchase.py b/purchase.py
index cd195b54fd..b505e1ed27 100644
--- a/purchase.py
+++ b/purchase.py
@@ -98,10 +98,15 @@ class Quotation(Workflow, ModelSQL, ModelView):
             ])
     warehouse = fields.Many2One('stock.location', 'Warehouse',
         domain=[('type', '=', 'warehouse')])
-    supplier = fields.Many2One('party.party', 'Supplier', required=True,
+    supplier = fields.Many2One(
+        'party.party', "Supplier", required=True,
         states={
             'readonly': Eval('lines', [0]) & Eval('supplier'),
-            },)
+            },
+        context={
+            'company': Eval('company', -1),
+            },
+        depends=['company'])
     supplier_address = fields.Many2One('party.address', 'Supplier Address',
         domain=[
             ('party', '=', Eval('supplier')),
diff --git a/tests/test_purchase_request_quotation.py b/tests/test_purchase_request_quotation.py
index 22ee4133af..f1c8c7baf2 100644
--- a/tests/test_purchase_request_quotation.py
+++ b/tests/test_purchase_request_quotation.py
@@ -10,8 +10,11 @@ from trytond.tests.test_tryton import suite as test_suite
 from trytond.tests.test_tryton import doctest_teardown
 from trytond.tests.test_tryton import doctest_checker
 
+from trytond.modules.company.tests import CompanyMultiValueTestMixin
 
-class PurchaseRequestForQuotationTestCase(ModuleTestCase):
+
+class PurchaseRequestForQuotationTestCase(
+        CompanyMultiValueTestMixin, ModuleTestCase):
     'Test Purchase Request For Quotation module'
     module = 'purchase_request_quotation'