Merge lp:~openerp-dev/openobject-addons/6.1-opw-577511-rha into lp:openobject-addons/6.1

[Rifakat Husen (OpenERP)]

Hello,

Translation for string 'INV' is present but does not show up into journal entries posted through
Inventory for realistic product.

For Dutch(nl_NL) translation for 'INV: %s' is 'VRD: %s', so it should it should display proper
translated string when we install Dutch language.

Please review this fix.

Regards,
Rifakat Haradwala

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Already Fixed on Trunk (means that it was already fixed and merged in Trunk). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6931. By Rifakat Husen (OpenERP) on 2012-08-03

[FIX] stock: translation for string INV is there in Dutch language but it doesn't displayed for Journal entries posted through inventory

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-07-23 11:04:55 +0000
+++ stock/stock.py	2012-08-03 12:20:25 +0000
@@ -2687,7 +2687,7 @@
                 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,
                         'product_id': line.product_id.id,
                         'product_uom': line.product_uom.id,
                         'prodlot_id': lot_id,