[MERGE] translated key for INV (inventory)

bzr revid: fp@tinyerp.com-20121114122851-kn39kf8ranf7clkz

diff --cc addons/stock/stock.py
index d18a55e,2dfa843..859cda8
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -2878,7 -2875,7 +2878,7 @@@ class stock_inventory(osv.osv)
                  if change:
                      location_id = line.product_id.product_tmpl_id.property_stock_inventory.id
                      value = {
-                         'name': 'INV:' + str(line.inventory_id.id) + ':' + line.inventory_id.name,
 -                        'name': _('INV: %s') % str(line.inventory_id.id) + ':' + line.inventory_id.name,
++                        'name': _('INV:') + (line.inventory_id.name or ''),
                          'product_id': line.product_id.id,
                          'product_uom': line.product_uom.id,
                          'prodlot_id': lot_id,