Merge lp:~unifield-team/unifield-server/us-241 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_outgoing/wizard/internal_move_processor.py'
--- bin/addons/msf_outgoing/wizard/internal_move_processor.py	2016-03-08 15:48:47 +0000
+++ bin/addons/msf_outgoing/wizard/internal_move_processor.py	2016-11-10 08:15:39 +0000
@@ -180,16 +180,23 @@
                 _('No data to process !'),
             )
 
+        view_by_pick_type = {
+            'in': ('view_picking_in_form', _('Incoming Shipments')),
+            'internal': ('view_picking_form', _('Internal Moves')),
+            'out': ('view_picking_out_form', _('Delivery Orders')),
+        }
+
         # Res
         res = kwargs['res']
 
         for wizard in self.browse(cr, uid, ids, context=context):
             if wizard.register_a_claim:
-                view_id = data_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
-                view_id = view_id and view_id[1] or False
                 # id of treated picking (can change according to backorder or not)
                 pick_id = res.values()[0]['delivered_picking']
-                return {'name': _('Delivery Orders'),
+                pick_type = self.pool.get('stock.picking').browse(cr, uid, pick_id, context=context).type
+                view_id = data_obj.get_object_reference(cr, uid, 'stock', view_by_pick_type.get(pick_type, [False])[0])
+                view_id = view_id and view_id[1] or False
+                return {'name': view_by_pick_type.get(pick_type, [None, _('Delivery Orders')])[1],
                         'view_mode': 'form,tree',
                         'view_id': [view_id],
                         'view_type': 'form',