Merge lp:~openerp-dev/openobject-addons/6.1-opw-577716-mtr into lp:openobject-addons/6.1

[Meera Trambadia (OpenERP)]

Hello,

[FIX] stock: fixed the issue of ascii code on packaging number.

Steps:-
1.Create a Delivery order.
2.Create a Packaging,the packaging number get some strange ascii code after it.

Kindly review the fix.

Thanks,
mtr

[lp:~openerp-dev/openobject-addons/6.1-opw-577716-mtr]

6948. By Meera Trambadia (OpenERP) on 2012-08-27

[IMP] stock: removed or from the condition preventing the concatenation of empty brackets on packaging no

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug is not reproducible on 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

6948. By Meera Trambadia (OpenERP) on 2012-08-27

[IMP] stock: removed or from the condition preventing the concatenation of empty brackets on packaging no

6947. By Meera Trambadia (OpenERP) on 2012-08-14

[FIX] stock: fixed the issue of ascii code on packaging number (OPW:577716)

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-08-07 10:04:35 +0000
+++ stock/stock.py	2012-08-27 07:32:36 +0000
@@ -512,7 +512,7 @@
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
-        res = [(r['id'], r['name']+' ['+(r['serial'] or '')+']') for r in self.read(cr, uid, ids, ['name', 'serial'], context)]
+        res = [(r['id'], r['name']+' ['+(r['serial'])+']') if r['serial'] else (r['id'], r['name']) for r in self.read(cr, uid, ids, ['name', 'serial'], context)]
         return res
 
     def unlink(self, cr, uid, ids, context=None):