Merge PR #4873 into 18.0

Signed-off-by pedrobaeza

Author: OCA-git-bot

delivery_gls_asm/views/stock_picking_views.xml

@@ -16,7 +16,7 @@
                     class="fa fa-arrow-right oe_link"
                     name="cancel_shipment"
                     string="Cancel"
-                    invisible="not carrier_tracking_ref or delivery_type != 'gls_asm' or state == 'done'"
+                    invisible="not carrier_tracking_ref or not gls_carrier_is_pickup_service or state == 'done'"
                 />
             </xpath>
             <xpath expr="//div[@name='tracking']" position="after">