Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/sorting

# Conflicts:
#	public/mix-manifest.json

resources/assets/js/pages/booking/uploadPo.vue

@@ -9,7 +9,7 @@
       <div class="col">
         <div class="card">
           <div class="card-header">Upload PO
-            <a href="/po-format.xls" target="_blank">(Download Po Format)</a>
+            <a href="/CIEF-X-Plan-PO-Format-15.0.xlsm" target="_blank">(Download Po Format)</a>
           </div>
           <!-- upload image -->
           <div class="card-body">