bugfix: correct subtotal_after_discount when vat and no discount