diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 1f6279af3ad..42f8b849fda 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -318,21 +318,26 @@ class purchase_order(osv.osv):
         for po in self.browse(cr, uid, ids, context=context):
             pick_ids += [picking.id for picking in po.picking_ids]
 
-        res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
-        res_id = res and res[1] or False
-
-        return {
-            'name': _('Receptions'),
-            'view_type': 'form',
-            'view_mode': 'form',
-            'view_id': [res_id],
-            'res_model': 'stock.picking',
-            'context': "{'contact_display': 'partner'}",
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-            'target': 'current',
-            'res_id': pick_ids and pick_ids[0] or False,
-        }
+        action_model, action_id = tuple(mod_obj.get_object_reference(cr, uid, 'stock', 'action_picking_tree4'))
+        action = self.pool.get(action_model).read(cr, uid, action_id, context=context)
+        ctx = eval(action['context'])
+        ctx.update({
+            'search_default_purchase_id': ids[0]
+        })
+        if pick_ids and len(pick_ids) == 1:
+            form_view_ids = [view_id for view_id, view in action['views'] if view == 'form']
+            view_id = form_view_ids and form_view_ids[0] or False
+            action.update({
+                'views': [],
+                'view_mode': 'form',
+                'view_id': view_id,
+                'res_id': pick_ids[0]
+            })
+            
+        action.update({
+            'context': ctx,
+        })
+        return action
 
     def wkf_approve_order(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 5d6f6c34b3b..7080170b419 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -26,7 +26,9 @@
         <menuitem
             action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
             parent="menu_purchase_config_pricelist" sequence="10" />
-
+        <menuitem
+            action="product.product_price_type_action" id="menu_product_pricelist_action2_purchase_type"
+            parent="menu_purchase_config_pricelist" sequence="60" />
         <menuitem
             id="menu_product_in_config_purchase" name="Products"
             parent="menu_purchase_config_purchase" sequence="30" groups="base.group_no_one"/>
@@ -188,7 +190,7 @@
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
                     <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,approved,done,sent" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
                 </header>
                 <sheet>
                     <div class="oe_title">
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index b522618ed2e..5f9f983062e 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -11,16 +11,6 @@
                 </xpath>
             </field>
         </record>
-        <record id="stock_picking_inherit_purchase" model="ir.ui.view">
-            <field name="name">Picking list</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_form"/>
-            <field name="arch" type="xml">
-                <field name="auto_picking" position="after">
-                    <field name="purchase_id" invisible="1"/>
-                </field>
-            </field>
-        </record>
 
         <record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
             <field name="name">Incoming Picking Inherited</field>
@@ -36,63 +26,18 @@
             </field>
         </record>
 
-        <!-- Picking to Invoice -->
-        <record id="view_picking_in_search_picking_to_invoice" model="ir.ui.view">
-            <field name="name">stock.picking.in.search</field>
+        <record id="view_picking_in_search_picking_inherit" model="ir.ui.view">
+            <field name="name">stock.picking.in.search.inherit</field>
             <field name="model">stock.picking.in</field>
+            <field name="inherit_id" ref="stock.view_picking_in_search"/>
             <field name="arch" type="xml">
-                <search string="Picking to Invoice">
-                    <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                    <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
-                    <filter icon="terp-dialog-close" name="done" string="Received" domain="[('state','=','done')]" help="Incoming Shipments already Received"/>
-                    <separator/>
-                    <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                    <separator/>
-                    <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
-                    <field name="stock_journal_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="purchase_id" />
-                    <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter icon="terp-stock_effects-object-colorize" name="Status" string="Status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Scheduled Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
-                    </group>
-                </search>
+                <xpath expr="//field[@name='product_id']" position="before">
+                    <field name="purchase_id"/>
+                </xpath>
             </field>
         </record>
-        <record id="act_purchase_order_2_stock_picking" model="ir.actions.act_window">
-            <field name="name">Incoming Shipments</field>
-            <field name="res_model">stock.picking.in</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar</field>
-            <field name="domain">[('type','=','in')]</field>
-            <field name="context">{'search_default_purchase_id': active_id,'default_type': 'in'}</field>
-            <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
-        </record>
-        
-        <record id="act_purchase_order_2_stock_picking_tree" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="stock.view_picking_in_tree"/>
-            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
-        </record>
-        
-        <record id="act_purchase_order_2_stock_picking_form" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="stock.view_picking_in_form"/>
-            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
-        </record>
-        
-        <record id="act_purchase_order_2_stock_picking_calendar" model="ir.actions.act_window.view">
-            <field eval="3" name="sequence"/>
-            <field name="view_mode">calendar</field>
-            <field name="view_id" ref="stock.stock_picking_in_calendar"/>
-            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
-        </record>
 
+        <!-- is it need ? we have another method "Receive Products"-->
         <record id="purchase_order_2_stock_picking" model="ir.ui.view">
             <field name="name">Purchase Picking Inherited</field>
             <field name="model">purchase.order</field>
@@ -100,8 +45,8 @@
             <field name="arch" type="xml">
                  <xpath expr="//div[contains(@class, 'oe_title')]" position="before">
                     <div class="oe_right oe_button_box" name="buttons">
-                        <button type="action"
-                            name="%(act_purchase_order_2_stock_picking)d"
+                        <button type="object"
+                            name="view_picking"
                             string="Incoming Shipments" states="approved"/>
                     </div>
                 </xpath>
@@ -110,13 +55,13 @@
 
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
             <field name="name">On Incoming Shipments</field>
-            <field name="res_model">stock.picking</field>
+            <field name="res_model">stock.picking.in</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','in')]</field>
             <field name="context">{"default_type": "in", "contact_display": "partner_address", "search_default_done": 1, "search_default_to_invoice": 1}</field>
-            <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
+            <field name="search_view_id" ref="stock.view_picking_in_search"/>
             <field name="help" type="html">
               <p>
                 Here you can track all the product receptions of purchase