Use the subtotal with tax in GUI and PDF