[MERGE]Merge with lp:~openerp-dev/openobject-addons/trunk-stock_picking_usability

bzr revid: mma@tinyerp.com-20120402052937-7j4rcyfh0qj7p2gh

diff --cc addons/purchase/purchase.py
index ce36428,79d71f2..a0f7d50
--- 1/addons/purchase/purchase.py
--- 2/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@@ -432,9 -427,8 +427,7 @@@ class purchase_order(osv.osv)
              'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'),
              'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
              'date': order.date_order,
--            'type': 'in',
-             'force_assign_picking': True,
-             'address_id': order.dest_address_id.id or order.partner_address_id.id,
+             'partner_id': order.dest_address_id.id or order.partner_id.id,
              'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
              'purchase_id': order.id,
              'company_id': order.company_id.id,

diff --cc addons/stock/stock.py
Simple merge

diff --cc addons/stock/stock_demo.yml
index a99109c,0db509e..c1cee5c
--- 1/addons/stock/stock_demo.yml
--- 2/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@@ -90,10 -90,9 +90,10 @@@
      location_dest_id: location_delivery_counter
  -
   !record {model: stock.picking, id: incomming_shipment}:
 +    force_assign_picking: True
      type: in
      invoice_state: 2binvoiced
-     address_id: base.res_partner_address_9
+     partner_id: base.res_partner_address_9
      location_dest_id: location_refrigerator
  -
   !record {model: stock.move, id: incomming_shipment_icecream}: