Merge proposals dependent on lp:~openbig/bigconsulting/changes_account_invoice_cash_discount

1. changes_account_invoice_cash_discount
2. Dependent merge proposals