extra invoice model methods to check if there's vat/discount
Merge branch 'discounts' into invoice-generation

Conflicts:
	app/invoice.rb