diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 15f6b31f36d..8bbdb8625e5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1007,8 +1007,7 @@ class stock_picking(osv.osv):
     # Methods for the barcode UI
 
     def get_picking_for_packing_ui(self, cr, uid, context=None):
-        res = self.search(cr, uid, [('state', 'in', ('confirmed', 'assigned'))], limit=1, context=context)
-        return res and res[0] or False  # TODO: what to do if nothing is left to do?
+        return self.search(cr, uid, [('state', 'in', ('confirmed', 'assigned'))], context=context)
 
     def action_done_from_packing_ui(self, cr, uid, picking_id, only_split_lines=False, context=None):
         self.do_partial(cr, uid, picking_id, only_split_lines, context=context)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 716d627ddbc..d2abec65ee4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1649,8 +1649,8 @@
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='general']" position="after" >
                    <newline/>
-                   <group>
-                       <field name="route_ids" widget="many2many_tags"/>
+                   <group string="Supply Chain Information">
+                       <field name="route_ids" widget="many2many_checkboxes"/>
                    </group>
                    <newline/>
                 </xpath>