fix hardcoding

Merged Santiago Said requested to merge fix-hardcoded-vat into 8.0-stage

It will be uploaded to staging to be tested by customer and then merged to main branch

Merge request reports