diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ce8923ed5cd..c69bc376543 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -189,7 +189,7 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1" help="Purchase order which are in the exception state"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To be Invoiced" domain="[('invoiced','=',1)]" separator="1" help="Purchase order to be invoiced"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="No Invoice" domain="[('invoice_id','=',False)]" separator="1" help="Purchase order with No Invoice" groups="base.group_extended"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Reference"/>
                     <field name="partner_id" select="1"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d6f4a95bc9e..6fdd2f0a0fd 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1284,6 +1284,9 @@ class stock_picking(osv.osv):
         @param ids: List of Picking Ids
         @param context: A standard dictionary for contextual values
         """
+        if context is None:
+            context = {}
+        mob_obj = self.pool.get('ir.model.data')
         for pick in self.browse(cr, uid, ids, context=context):
             msg=''
             if pick.auto_picking:
@@ -1303,9 +1306,12 @@ class stock_picking(osv.osv):
                 'done': _('is done.'),
                 'draft':_('is in draft state.'),
             }
+            res = mob_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
+            view_id = res and res[1] or False
+            context.update({'view_id': view_id})
             message += state_list[pick.state]
-            self.log(cr, uid, pick.id, message)
-        return True
+            self.log(cr, uid, pick.id, message,context=context)
+        return context
 
 stock_picking()