Fix receipt vs invoice
merge remote-tracking branch 'upstream/master'