diff --git a/agreement_stock/views/agreement_view.xml b/agreement_stock/views/agreement_view.xml
index 359876b5..14a1680b 100644
--- a/agreement_stock/views/agreement_view.xml
+++ b/agreement_stock/views/agreement_view.xml
@@ -52,7 +52,6 @@
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button name="%(action_stock_picking_agreement_specific)d"
                         type="action"
-                        attrs="{'invisible': [('picking_count', '=', 0)]}"
                         class="oe_stat_button" icon="fa-truck">
                     <div class="o_field_widget o_stat_info">
                         <span class="o_stat_value">
@@ -64,7 +63,6 @@
                 </button>
                 <button name="%(action_stock_move_agreement_specific)d"
                         type="action"
-                        attrs="{'invisible': [('move_count', '=', 0)]}"
                         class="oe_stat_button" icon="fa-arrows-v">
                     <div class="o_field_widget o_stat_info">
                         <span class="o_stat_value">
@@ -76,7 +74,6 @@
                 </button>
                 <button name="%(action_stock_production_lot_agreement_specific)d"
                         type="action"
-                        attrs="{'invisible': [('lot_count', '=', 0)]}"
                         class="oe_stat_button" icon="fa-arrows">
                     <div class="o_field_widget o_stat_info">
                         <span class="o_stat_value">
diff --git a/agreement_stock/views/stock_view.xml b/agreement_stock/views/stock_view.xml
index 3f1707bf..cddd4565 100644
--- a/agreement_stock/views/stock_view.xml
+++ b/agreement_stock/views/stock_view.xml
@@ -7,7 +7,8 @@
         <field name="inherit_id" ref="stock.view_picking_form"/>
         <field name="arch" type="xml">
             <field name="origin" position="before">
-                <field name="agreement_id"/>
+                <field name="agreement_id"
+                       domain="[('partner_id', '=', partner_id)]"/>
             </field>
         </field>
     </record>