diff --git a/ssi_stock/models/stock_picking.py b/ssi_stock/models/stock_picking.py
index 7df07f9..ef85b5c 100644
--- a/ssi_stock/models/stock_picking.py
+++ b/ssi_stock/models/stock_picking.py
@@ -20,6 +20,11 @@ class StockPicking(models.Model):
         related="picking_type_id.category_id",
         store=True,
     )
+    partner_tag_ids = fields.Many2many(
+        string="Partner Tags",
+        related="partner_id.commercial_partner_id.category_id",
+        store=False,
+    )
     show_price_unit = fields.Boolean(
         string="Show Price Unit",
         related="picking_type_id.show_price_unit",
diff --git a/ssi_stock/views/stock_picking_views.xml b/ssi_stock/views/stock_picking_views.xml
index 1e2e84c..3e05863 100644
--- a/ssi_stock/views/stock_picking_views.xml
+++ b/ssi_stock/views/stock_picking_views.xml
@@ -34,6 +34,9 @@
             <xpath expr="//field[@name='picking_type_id']" position="before">
                 <field name="picking_type_category_id" invisible="1" />
             </xpath>
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="partner_tag_ids" widget="many2many_tags" optional="hide" />
+            </xpath>
             <xpath expr="//field[@name='date_deadline']" position="after">
                 <field name="date_backdating" optional="hide" />
                 <field name="date_done" />