Merge pull request #138 from MargaretLangley/master

Constants used in invoice and invoice_texts moved from global to Invoice...