Merge pull request #747 from Asturyan/dev

Fix display taxes in invoice template