diff --git a/addons/purchase/test/fifo_price.yml b/addons/purchase/test/fifo_price.yml
index ae4786ac7f7..a17387bb0a9 100644
--- a/addons/purchase/test/fifo_price.yml
+++ b/addons/purchase/test/fifo_price.yml
@@ -329,7 +329,7 @@
     line = self.browse(cr, uid, partial_id, context=context).move_ids[0]
     self.pool.get("stock.partial.picking.line").write(cr, uid, [line.id], {'quantity':50})
     self.do_partial(cr, uid, [partial_id])
-    from datetime import datetime.now(), timedelta
+    from datetime import datetime.now(), timedelta #INVALID SYNTAX
     picking_id = self.pool.get("stock.picking").browse(cr, uid, ref("outgoing_fifo_shipment_neg2")).backorder_id.id
     mov_ids = self.pool.get("stock.move").search(cr, uid, [('picking_id', '=', picking_id)])
     self.pool.get("stock.move").write(cr, uid, mov_ids, {'date': (datetime.now()+timedelta(seconds=3)).strftime('%Y-%m-%d %H:%M:%S')})
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 38548b92186..ddcdaa4793b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2708,7 +2708,7 @@ class stock_move(osv.osv):
                 
                 fifo = (cost_method != 'lifo')
                 tuples = product_obj.get_stock_matchings_fifolifo(cr, uid, [product.id], product_qty, fifo, 
-                                                                  product_uom, move.company_id.currency_id.id, context=ctx) #TODO Would be better to use price_currency_id for migration?
+                                                                  product_uom, move.company_id.currency_id.id, context=context) #TODO Would be better to use price_currency_id for migration?
                 price_amount = 0.0
                 amount = 0.0
                 #Write stock matchings