Merge pull request #1013 from vishal-singh-webkul/gli-1879

Fixed: Notice on room type page in the front office caused by selecting 'no tax' as a tax rule option.

classes/tax/TaxRulesTaxManager.php

@@ -104,6 +104,7 @@ public function getTaxCalculator()
 				AND tr.`id_country` = '.(int)$this->address->id_country.'
 				AND tr.`id_tax_rules_group` = '.(int)$this->type.'
 				AND tr.`id_state` IN (0, '.(int)$this->address->id_state.')
+				AND tr.`id_tax` !=0
 				AND (\''.pSQL($postcode).'\' BETWEEN tr.`zipcode_from` AND tr.`zipcode_to`
 					OR (tr.`zipcode_to` = 0 AND tr.`zipcode_from` IN(0, \''.pSQL($postcode).'\')))
 				ORDER BY tr.`zipcode_from` DESC, tr.`zipcode_to` DESC, tr.`id_state` DESC, tr.`id_country` DESC');