Merge pull request #1371 from bradymiller/cleanup-front-office-receipts_1