From 0dc363f7d4ffd41e3364859ae0a8a64a2638bfbe Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 6 Sep 2013 10:44:09 +0200 Subject: [PATCH] [FIX] purchase: fifo price.yml + fix in action_assign (wrong uom qty conversion) bzr revid: qdp-launchpad@openerp.com-20130906084409-ro0atvrcxh8b6nep --- addons/purchase/test/fifo_price.yml | 2 +- addons/stock/stock.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/purchase/test/fifo_price.yml b/addons/purchase/test/fifo_price.yml index 3c45cd1c9c1..42e8897eb01 100644 --- a/addons/purchase/test/fifo_price.yml +++ b/addons/purchase/test/fifo_price.yml @@ -190,7 +190,7 @@ Process the reception of purchase order with usd - !python {model: stock.picking}: | - pick_obj = self.pool.get('stock.picking').browse(cr, uid, ref("purchase_order_fifo_usd")) + pick_obj = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fifo_usd")).picking_ids[0] pick_obj.do_partial(context=context) - We create delivery order of 49.5 kg diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 87f29cc6124..6923044dc4e 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -231,7 +231,6 @@ class stock_quant(osv.osv): result += self._quants_get_lifo(cr, uid, location, product, qty, domain, prefered_order=prefered_order, context=context) else: raise osv.except_osv(_('Error!'), _('Removal strategy %s not implemented.' % (removal_strategy,))) - print 'Quant get result', result return result # @@ -1441,7 +1440,7 @@ class stock_move(osv.osv): done.append(move.id) continue else: - qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, move.product_id.uom_id.id) + qty = move.product_qty dp = [] for m2 in move.move_orig_ids: for q in m2.quant_ids: