Merge pull request #1013 from rustyswayne/1.6.1

Adds an Enumeration of InvoiceDisplay to CustomerDisplay - relates to M-543