More Fixes for Challan and Sales Tax Inv