Merge pull request #1818 from julesstp/22616_invoiceFormat