From bf7a359abe49c83ef74aca8401fe970d3b68e570 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 16 Sep 2013 10:21:16 +0200 Subject: [PATCH] [FIX] Default picking type method of PoS should return id bzr revid: jco@openerp.com-20130916082116-tqe24ota8fzb7uh8 --- addons/point_of_sale/point_of_sale.py | 2 +- addons/stock_invoice_directly/test/stock_invoice_directly.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 4767d90f188..7ef72013734 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -663,7 +663,7 @@ class pos_order(osv.osv): def _get_out_picking_type(self, cr, uid, context=None): try: - picking_type = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'picking_type_out', context=context) + picking_type = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'picking_type_out', context=context).id except: picking_type = False return picking_type diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml index b1c758ca3d1..c2687b2ef21 100644 --- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml +++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml @@ -54,5 +54,4 @@ picking = picking_obj.browse(cr, uid, [ref('stock_picking_out0')]) partner = picking[0].partner_id.id inv_ids = self.search(cr, uid, [('type','=','out_invoice'),('partner_id','=',partner)]) - assert inv_ids, 'No Invoice is generated!' - + assert inv_ids, 'No Invoice is generated!' \ No newline at end of file