diff --git a/addons/stock_fifo_lifo/stock_fifo_lifo.py b/addons/stock_fifo_lifo/stock_fifo_lifo.py index cc8e15a5e45..8dc906832e7 100644 --- a/addons/stock_fifo_lifo/stock_fifo_lifo.py +++ b/addons/stock_fifo_lifo/stock_fifo_lifo.py @@ -48,6 +48,7 @@ class product_product (osv.osv): UoMs and currencies from the corresponding moves are converted towards that given in the params ''' assert len(ids) == 1, _('Only the fifolifo stock matchings of one product can be calculated at a time.') + print uid, ids, qty, fifo, product_uom_id, currency_id, context uom_obj = self.pool.get('product.uom') currency_obj = self.pool.get('res.currency') @@ -65,7 +66,8 @@ class product_product (osv.osv): if not currency_id: currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id - + print fifo + print company_id, product.id if fifo: move_in_ids = move_obj.search(cr, uid, [('company_id','=', company_id), ('qty_remaining', '>', 0), ('state', '=', 'done'), ('type', '=', 'in'), ('product_id', '=', product.id)], @@ -74,6 +76,7 @@ class product_product (osv.osv): move_in_ids = move_obj.search(cr, uid, [('company_id','=', company_id), ('qty_remaining', '>', 0), ('state', '=', 'done'), ('type', '=', 'in'), ('product_id', '=', product.id)], order = 'date desc', context=context) + print move_in_ids tuples = [] qty_to_go = qty for move in move_obj.browse(cr, uid, move_in_ids, context=context): diff --git a/addons/stock_fifo_lifo/test/lifo_price.yml b/addons/stock_fifo_lifo/test/lifo_price.yml index 24ce3ac4821..9cb3ed791b7 100644 --- a/addons/stock_fifo_lifo/test/lifo_price.yml +++ b/addons/stock_fifo_lifo/test/lifo_price.yml @@ -46,10 +46,6 @@ I confirm the first purchase order - !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lifo1} -- - I confirm the second purchase order -- - !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lifo2} - I check the "Approved" status of purchase order 1 - @@ -67,6 +63,10 @@ - !python {model: product.product}: | assert self.browse(cr, uid, ref("product_lifo_icecream")).standard_price == 70.0, 'Standard price should not have changed!' +- + I confirm the second purchase order +- + !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lifo2} - Process the reception of purchase order 2 -