diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py
index bdae93a4054..99ba231daeb 100644
--- a/addons/stock/procurement.py
+++ b/addons/stock/procurement.py
@@ -174,7 +174,7 @@ class procurement_order(osv.osv):
             'product_uom_qty': qty_left,
             'product_uos_qty': (procurement.product_uos and qty_uos_left) or qty_left,
             'product_uos': (procurement.product_uos and procurement.product_uos.id) or procurement.product_uom.id,
-            'partner_id': procurement.group_id and procurement.group_id.partner_id and procurement.group_id.partner_id.id or False,
+            'partner_id': procurement.rule_id.partner_address_id.id or (procurement.group_id and procurement.group_id.partner_id.id) or False,
             'location_id': procurement.rule_id.location_src_id.id,
             'location_dest_id': procurement.rule_id.location_id.id,
             'move_dest_id': procurement.move_dest_id and procurement.move_dest_id.id or False,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7d3dba2f47b..32f28bb7722 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1985,7 +1985,7 @@ class stock_move(osv.osv):
                 'origin': move.origin,
                 'company_id': move.company_id and move.company_id.id or False,
                 'move_type': move.group_id and move.group_id.move_type or 'one',
-                'partner_id': move.group_id and move.group_id.partner_id and move.group_id.partner_id.id or False,
+                'partner_id': move.partner_id.id or False,
                 'picking_type_id': move.picking_type_id and move.picking_type_id.id or False,
             }
             pick = pick_obj.create(cr, uid, values, context=context)