Merge lp:~openerp-dev/openobject-addons/trunk-bug-1005812-amb into lp:openobject-addons

[Amit Bhavsar (Open ERP)]

Hello,

Fixes the problem of Insufficient info at move from the picklist(dropdown) in Repair Order form view.
Now it will look like : Origin(SO0004) product_name(watch) : location > destination location.

instead of

Product_name(watch) : location > destination

Thanks!

[Amit Parik (amit-parik)]

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-1005812-amb]

7019. By Anto on 2012-09-11

[MERGE] latest trunk

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-06-22 06:48:54 +0000
+++ stock/stock.py	2012-07-11 10:52:57 +0000
@@ -1576,7 +1576,7 @@
     def name_get(self, cr, uid, ids, context=None):
         res = []
         for line in self.browse(cr, uid, ids, context=context):
-            res.append((line.id, (line.product_id.code or '/')+': '+line.location_id.name+' > '+line.location_dest_id.name))
+            res.append((line.id, (line.picking_id.origin or '/')+ ' ' +(line.product_id.code or '/')+': '+line.location_id.name+' > '+line.location_dest_id.name))
         return res
 
     def _check_tracking(self, cr, uid, ids, context=None):