diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 1f2ad780b4f..a4b7c367065 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -569,7 +569,9 @@ class stock_picking(osv.osv):
 				self.pool.get('sale.order').write(cr, uid, [p.sale_id.id], {
 					'invoiced': True
 				})
+		self.write(cr, uid, res.keys(), {'invoice_state': 'invoiced'})
 		return res
+
 stock_picking()
 
 class stock_production_lot(osv.osv):
diff --git a/addons/stock/wizard/wizard_invoice_onshipping.py b/addons/stock/wizard/wizard_invoice_onshipping.py
index 30cd19b22e7..49e8af8fa96 100644
--- a/addons/stock/wizard/wizard_invoice_onshipping.py
+++ b/addons/stock/wizard/wizard_invoice_onshipping.py
@@ -100,12 +100,8 @@ def _create_invoice(obj, cr, uid, data, context):
 			journal_id=data['form']['journal_id'],group=data['form']['group'],
 			type=type, context= context)
 
-	pick_ids = res.keys()
 	invoice_ids = res.values()
 
-	pool.get('stock.picking').write(cr, uid, pick_ids,
-			{'invoice_state': 'invoiced'})
-
 	if not invoice_ids:
 		return {}