fix #2352 shipment VAT error

While fixing this also found that value of shipment VAT is not updating. So altering the order of hidden field and checkbox solves the issue. Keeping base master as it has also this issue.