fixed a variable overwritten in tax settings
fixed another variable overwritten in tax settings
Merge pull request #5574 from claudiosmweb/fix-tax-settings-save

[2.1] Fix a variable overwritten in tax settings