fix boolean to integer conversion for taxable flag
Merge branch 'development' into mobile