[FIX] Revert unintended changes
[FIX] Pep8
Merge pull request #1 from StefanRijnhart/7.0-invoice_customs_cleanup

7.0 invoice customs cleanup