Forward port of 7.0 up to rev 9b87d6f

[odoo/odoo.git] / addons / stock / stock.py

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 99d420f..5492b60 100644 (file)
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1198,7 +1198,9 @@ class stock_picking(osv.osv):
             context = {}
         for pick in self.browse(cr, uid, ids, context=context):
             if pick.state in ['done','cancel']:
-                raise osv.except_osv(_('Error!'), _('You cannot remove the picking which is in %s state!')%(pick.state,))
+                # retrieve the string value of field in user's language
+                state = dict(self.fields_get(cr, uid, context=context)['state']['selection']).get(pick.state, pick.state)
+                raise osv.except_osv(_('Error!'), _('You cannot remove the picking which is in %s state!')%(state,))
             else:
                 ids2 = [move.id for move in pick.move_lines]
                 ctx = context.copy()