bugfix: correct subtotal_after_discount when vat and no discount
Merge branch 'discounts' into invoice-generation