Merge pull request #378 from DiamondLightSource/pre-release/2022-R5.2.1

Merge 2022-R5.2.1 into master

Author: MattPrit

client/src/js/templates/shipment/shipment.html

@@ -19,7 +19,7 @@ <h1>Shipment: <span class="SHIPPINGNAME"><%-SHIPPINGNAME%></span></h1>
             <a class="button send" href="#"><i class="fa fa-plane"></i> Mark as Sent</a>
         <% } %>
 
-        <% if (DHL_ENABLE && (DELIVERYAGENT_AGENTNAME.toLowerCase() == 'dhl' || !DELIVERYAGENT_AGENTNAME)) { %>
+        <% if (!DELIVERYAGENT_AGENTNAME || (DHL_ENABLE && DELIVERYAGENT_AGENTNAME.toLowerCase() == 'dhl')) { %>
         <% if (DELIVERYAGENT_HAS_LABEL == '1') { %>
             <a class="button pdf" href="<%-APIURL%>/pdf/awb/sid/<%-SHIPPINGID%>"><i class="fa fa-print"></i> Print Air Waybill</a>
             <!-- <a class="button cancel" href="#"><i class="fa fa-truck"></i> Cancel Pickup</a> -->