Map invoice discount

+ squash commits failure