fix haltr_mailer test
BatchIdentifier: use company_taxcode + invoice_number
Merge branch 'master' into quotes

Conflicts:
	test/unit/haltr_mailer_test.rb