Amend vat deadline date logic

https://www.pivotaltracker.com/story/show/61972994 factcheck amends for payment deadline