[MERGE] Merge for pos

bzr revid: jco@openerp.com-20130827144201-cclwd1l3mlzi3fgl

addons/point_of_sale/point_of_sale.py

@@ -700,7 +700,7 @@ class pos_order(osv.osv):
             picking_id = picking_obj.create(cr, uid, {
                 'origin': order.name,
                 'partner_id': addr.get('delivery',False),
-                'type': 'out',
+                'picking_type_id': self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'picking_type_out', context=context).id,
                 'company_id': order.company_id.id,
                 'move_type': 'direct',
                 'note': order.note or "",

addons/point_of_sale/wizard/pos_return.py

@@ -213,7 +213,7 @@ class add_product(osv.osv_memory):
                                 'name':'%s (Added)' %order_id.name,
                                 'move_lines':[],
                                 'state':'draft',
-                                'type':'out',
+                                'picking_type_id': self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'picking_type_out', context=context).id,
                                 'date':date_cur
                             })
                 stock_move_obj.create(cr, uid, {