My store is set to display inclusive of tax. When I have a discount applied, the quantity total deductions and sub total after discounts are showing exclusive of tax.
I traced this down to classes/order.php line 293

In v1.5.5 this has been changed from

$taxCountryId = $taxZoneId = -1;

to

$taxCountryId = $taxZoneId = 0;

when it is -1 by default, the deductions and subtotal correctly show to include tax.

Is there any fix for this, apart from removing the updated code introduced in 1.5.5 ?