Mostly bugs fixes related to Net despatch and the invoice template builder