diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 16bf0501f36..de4e2e7f561 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -68,7 +68,7 @@ class product_pulled_flow(osv.osv):
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
         'type_proc': fields.selection([('produce','Produce'),('buy','Buy'),('move','Move')], 'Type of Procurement', required=True),
         'company_id': fields.many2one('res.company', 'Company', help="Is used to know to which company belong packings and moves"),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Address'),
+        'partner_address_id': fields.many2one('res.partner', 'Partner Address'),
         'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
         'product_id':fields.many2one('product.product','Product'),
         'invoice_state': fields.selection([
diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
index c5e134181f7..3660e9c8ac6 100644
--- a/addons/stock_location/test/stock_location_pull_flow.yml
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -106,11 +106,10 @@
   I create a Supplier.
 -
   !record {model: res.partner, id: res_partner_shawtrust0}:
-    address:
-      - country_id: base.in
-      - street: St James House, Vicar Lane, Sheffield
+    name: Shaw Trust
     lang: en_US
-    name: 'Shaw Trust '
+    country_id: base.in
+    street: St James House, Vicar Lane, Sheffiel
     property_account_payable: account_account_payable0
     property_account_receivable: account_account_receivable0
 -
diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml
index b6a938e99e5..3de87afccd1 100644
--- a/addons/stock_location/test/stock_location_push_flow.yml
+++ b/addons/stock_location/test/stock_location_push_flow.yml
@@ -11,19 +11,20 @@
   I create Supplier.
 -
   !record {model: res.partner, id: res_partner_microlinktechnologies0}:
-    address:
-      - street: Kailash Vaibhav, Parksite
+    street: Kailash Vaibhav, Parksite
     name: Micro Link Technologies
     property_account_payable: account_account_payable0
     property_account_receivable: account_account_receivable0
     supplier: true
+    is_company: true
 
 -
   I create Supplier address.
 -
-  !record {model: res.partner.address, id: res_partner_address_0}:
+  !record {model: res.partner, id: res_partner_address_0}:
+    name: Micro Link Technologies
     country_id: base.in
-    partner_id: res_partner_microlinktechnologies0
+    parent_id: res_partner_microlinktechnologies0
     street: Ash House, Ash Road
     title: base.res_partner_title_miss
 
@@ -104,12 +105,12 @@
 -
   !python {model: stock.picking }: |
    import time
-   picking_id = self.search(cr, uid, [('address_id.partner_id','=',ref('res_partner_microlinktechnologies0')),('type','=','in')])
+   picking_id = self.search(cr, uid, [('address_id.parent_id','=',ref('res_partner_microlinktechnologies0')),('type','=','in')])
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       move =pick.move_lines[0]
       partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
+           'partner_id':pick.address_id.parent_id.id,
             'address_id': pick.address_id.id,
             'delivery_date' : time.strftime('%Y-%m-%d'),
            }