diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a25e2503ba0..065a83263c8 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -890,6 +890,8 @@ class stock_picking(osv.osv):
         #TOFIX: assignment of move lines should be call before testing assigment otherwise picking never gone in assign state
         ok = True
         for pick in self.browse(cr, uid, ids):
+            if pick.type == 'in':
+                return True
             mt = pick.move_type
             for move in pick.move_lines:
                 if (move.state in ('confirmed', 'draft')) and (mt == 'one'):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2a137aa6235..be095e2dd04 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1211,7 +1211,7 @@
                                 </form>
                             </field>
                             <group col="10" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                                 <button name="draft_force_assign" states="draft" string="Confirm" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>