[FIX] Better tax calc

Merged Gabriel Davini requested to merge 8.0-log_improvements into 8.0-stage

Merge request reports