- $sql = "SELECT ".TB_PREF."tax_types.*,
- Chart1.account_name AS SalesAccountName,
- Chart2.account_name AS PurchasingAccountName
- FROM ".TB_PREF."tax_types, ".TB_PREF."chart_master AS Chart1,
- ".TB_PREF."chart_master AS Chart2
- WHERE ".TB_PREF."tax_types.sales_gl_code = Chart1.account_code
- AND ".TB_PREF."tax_types.purchasing_gl_code = Chart2.account_code";
-
+ $sql = "SELECT tax_type.*,
+ Chart1.account_name AS SalesAccountName,
+ Chart2.account_name AS PurchasingAccountName
+ FROM ".TB_PREF."tax_types tax_type,"
+ .TB_PREF."chart_master AS Chart1,"
+ .TB_PREF."chart_master AS Chart2
+ WHERE tax_type.sales_gl_code = Chart1.account_code
+ AND tax_type.purchasing_gl_code = Chart2.account_code";
+
+ if (!$all) $sql .= " AND !tax_type.inactive";