Adding account vat on payment 7

Moved from https://code.launchpad.net/~domsense/account-payment/adding_account_vat_on_payment_7/+merge/196914
closing tag should be inline with opening tags