[IMP] Improved the view open from Products Return.

bzr revid: mdi@tinyerp.com-20120330114111-u63i8ppy803dkgxw

1 files changed, 10 insertions, 15 deletions

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 689f17cd9b9..69ebd27602f 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -193,23 +193,18 @@ class stock_return_picking(osv.osv_memory):
         wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
         pick_obj.force_assign(cr, uid, [new_picking], context)
         # Update view id in context, lp:702939
-        view_list = {
-                'out': 'view_picking_out_tree',
-                'in': 'view_picking_in_tree',
-                'internal': 'vpicktree',
+        action_list = {
+                'out': 'action_picking_tree',
+                'in': 'action_picking_tree4',
+                'internal': 'action_picking_tree6',
             }
         data_obj = self.pool.get('ir.model.data')
-        res = data_obj.get_object_reference(cr, uid, 'stock', view_list.get(new_type, 'vpicktree'))
-        context.update({'view_id': res and res[1] or False})
-        return {
-            'domain': "[('id', 'in', ["+str(new_picking)+"])]",
-            'name': 'Picking List',
-            'view_type':'form',
-            'view_mode':'tree,form',
-            'res_model':'stock.picking',
-            'type':'ir.actions.act_window',
-            'context':context,
-        }
+        act_obj = self.pool.get('ir.actions.act_window')
+        result = data_obj.get_object_reference(cr, uid, 'stock', action_list.get(new_type, 'action_picking_tree6'))
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
+        result['domain'] = "[('id', 'in', ["+str(new_picking)+"])]"
+        return result
 
 stock_return_picking()