Fix tax details in templates
Fix tax details in templates
Fix tax details in invoice templates
Merge branch 'master' into quanticom