diff options
| author | Josse Colpaert <jco@openerp.com> | 2013-08-27 16:42:01 +0200 |
|---|---|---|
| committer | Josse Colpaert <jco@openerp.com> | 2013-08-27 16:42:01 +0200 |
| commit | fd31df3f04cccafc2deaf9b157b78d9f2c5bdc19 (patch) | |
| tree | b5918fc527eef2ad70ae6caab6ced990d4dd7cc0 /addons | |
| parent | ea3b868f4eebe0523669ea2d5b267a4e2f4399da (diff) | |
| parent | efc01a8a8473dd5ad86e6c23f397c18e886bd00d (diff) | |
[MERGE] Merge for pos
bzr revid: jco@openerp.com-20130827144201-cclwd1l3mlzi3fgl
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/point_of_sale/point_of_sale.py | 2 | ||||
| -rw-r--r-- | addons/point_of_sale/wizard/pos_return.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 2782f822149..591f65cf925 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/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 "", diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py index eeba6cab676..fac55c593e7 100644 --- a/addons/point_of_sale/wizard/pos_return.py +++ b/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, { |