diff --git a/views/stock_picking_views.xml b/views/stock_picking_views.xml
index 3447df6..5b4af8e 100644
--- a/views/stock_picking_views.xml
+++ b/views/stock_picking_views.xml
@@ -6,11 +6,12 @@
         <field name="inherit_id" ref="stock.view_picking_form"/>
         <field name="arch" type="xml">
             <xpath expr="//button[@name='button_validate']" position="before">
+                <field name="has_asset_moves" invisible="1"/>
                 <button name="action_generate_asset_codes" 
                         string="Generate Asset Codes" 
                         type="object"
                         class="oe_highlight" 
-                        invisible="state != 'assigned'"
+                        invisible="state != 'assigned' or not has_asset_moves"
                         groups="ga_asset_management.group_ga_asset_user"/>
             </xpath>
             <xpath expr="//field[@name='move_ids']/list/field[@name='product_id']" position="after">