diff --git a/delivery_hibou/models/stock.py b/delivery_hibou/models/stock.py
index 35559223..48719274 100644
--- a/delivery_hibou/models/stock.py
+++ b/delivery_hibou/models/stock.py
@@ -11,6 +11,7 @@ class StockPicking(models.Model):
             ('no', 'No'),
         ], string='Require Insurance', default='auto',
         help='If your carrier supports it, auto should be calculated off of the "Automatic Insurance Value" field.')
+    commercial_partner_id = fields.Many2one('res.partner', related='partner_id.commercial_partner_id')
 
     @api.depends('move_lines.priority', 'carrier_id')
     def _compute_priority(self):
diff --git a/delivery_hibou/views/stock_views.xml b/delivery_hibou/views/stock_views.xml
index 78067b01..ff0e14fb 100644
--- a/delivery_hibou/views/stock_views.xml
+++ b/delivery_hibou/views/stock_views.xml
@@ -7,8 +7,11 @@
         <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='carrier_id']" position="before">
+                <field name="commercial_partner_id" invisible="1" />
                 <field name="require_insurance" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"/>
-                <field name="shipping_account_id" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"/>
+                <field name="shipping_account_id" attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
+                       options="{'no_create': True, 'no_open': True}"
+                       domain="[('partner_id', 'in', (False, partner_id, commercial_partner_id))]"/>
             </xpath>
         </field>
     </record>