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

Proposed by Rifakat Husen (OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6931
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-577511-rha
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
stock/stock.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-577511-rha
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+118073@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

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)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock/stock.py'
2--- stock/stock.py 2012-07-23 11:04:55 +0000
3+++ stock/stock.py 2012-08-03 12:20:25 +0000
4@@ -2687,7 +2687,7 @@
5 if change:
6 location_id = line.product_id.product_tmpl_id.property_stock_inventory.id
7 value = {
8- 'name': 'INV:' + str(line.inventory_id.id) + ':' + line.inventory_id.name,
9+ 'name': _('INV: %s') % str(line.inventory_id.id) + ':' + line.inventory_id.name,
10 'product_id': line.product_id.id,
11 'product_uom': line.product_uom.id,
12 'prodlot_id': lot_id,