diff --git a/party.xml b/party.xml
index 6c953d91b0..c14fa44f4c 100644
--- a/party.xml
+++ b/party.xml
@@ -9,6 +9,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="domain"
                 eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('party', '=', Eval('active_id')), ('party', 'in', Eval('active_ids')))]"
                 pyson="1"/>
+            <field name="search_value" eval="[('state', 'not in', ['done', 'cancel'])]" pyson="1"/>
         </record>
         <record model="ir.action.keyword"
                 id="act_open_sale_keyword1">
@@ -21,6 +22,5 @@ this repository contains the full copyright notices and license terms. -->
             <field name="action" ref="act_sale_form2"/>
             <field name="group" ref="group_sale"/>
         </record>
-
     </data>
 </tryton>
diff --git a/stock.xml b/stock.xml
index 4c70caa35c..5b2cd70f34 100644
--- a/stock.xml
+++ b/stock.xml
@@ -9,5 +9,29 @@ this repository contains the full copyright notices and license terms. -->
             <field name="priority" eval="20"/>
             <field name="name">move_list_shipment</field>
         </record>
+
+        <record model="ir.action.act_window" id="act_sale_move_relate">
+            <field name="name">Moves</field>
+            <field name="res_model">stock.move</field>
+            <field
+                name="domain"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('sale', '=', Eval('active_id')), ('sale', 'in', Eval('active_ids')))]"
+                pyson="1"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_move_form_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="move_view_list_shipment"/>
+            <field name="act_window" ref="act_sale_move_relate"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_move_form_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="stock.move_view_form"/>
+            <field name="act_window" ref="act_sale_move_relate"/>
+        </record>
+        <record model="ir.action.keyword" id="act_move_form_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">sale.sale,-1</field>
+            <field name="action" ref="act_sale_move_relate"/>
+        </record>
     </data>
 </tryton>
diff --git a/view/party_form.xml b/view/party_form.xml
index 915f65b481..d2e7b4a3d2 100644
--- a/view/party_form.xml
+++ b/view/party_form.xml
@@ -2,6 +2,9 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
+    <xpath expr="//group[@id='links']" position="inside">
+        <link icon="tryton-sale" name="sale.act_sale_form2" empty="hide"/>
+    </xpath>
     <xpath expr="/form/notebook" position="inside">
         <page id="sale" string="Sale">
         </page>
diff --git a/view/sale_form.xml b/view/sale_form.xml
index 87000b7f16..f3d31b59e5 100644
--- a/view/sale_form.xml
+++ b/view/sale_form.xml
@@ -71,16 +71,12 @@ this repository contains the full copyright notices and license terms. -->
             <separator name="comment" colspan="4"/>
             <field name="comment" colspan="4"/>
         </page>
-        <page name="invoices">
-            <field name="invoices" colspan="4" mode="tree"/>
-        </page>
-        <page name="shipments">
-            <field name="moves" colspan="4" view_ids="sale.move_view_list_shipment" mode="tree"/>
-            <field name="shipments" colspan="4" mode="tree"/>
-            <field name="shipment_returns" colspan="4" mode="tree"/>
-        </page>
     </notebook>
-    <label id="empty" colspan="3"/>
+    <group id="links" col="-1" colspan="3">
+        <link icon="tryton-shipment-out" name="sale.act_shipment_form"/>
+        <link icon="tryton-account" name="sale.act_invoice_form"/>
+        <link icon="tryton-shipment-in" name="sale.act_return_form"/>
+    </group>
     <group col="-1" colspan="3" id="buttons">
         <button name="cancel" icon="tryton-cancel"/>
         <button name="modify_header" icon="tryton-launch"/>