[FIX][TOM-214]Map Taxes

Merged Gastón Bertolani requested to merge 15.0-TOM-214-map-tax into 15.0

Closes TOM-214

Merge request reports