Bug 5527: Tax Type not displayed during initial setup if default Sales and/or Purchas...

[fa-stable.git] / taxes / db / tax_types_db.inc

diff --git a/taxes/db/tax_types_db.inc b/taxes/db/tax_types_db.inc
index 08bf64c868245dc2a4a9a591bfee338a4c6dc39a..ae2cb01700da5fe42633a07d2ce3b2ce76d6c5f1 100644 (file)
--- a/taxes/db/tax_types_db.inc
+++ b/taxes/db/tax_types_db.inc
@@ -31,34 +31,33 @@ function update_tax_type($type_id, $name, $sales_gl_code, $purchasing_gl_code, $
 
 function get_all_tax_types($all=false)
 {
-       $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";
-
-       if (!$all) $sql .= " AND !".TB_PREF."tax_types.inactive";
+       $sql = "SELECT tax_type.*,
+                               Chart1.account_name AS SalesAccountName,
+                               Chart2.account_name AS PurchasingAccountName
+                       FROM ".TB_PREF."tax_types tax_type LEFT JOIN "
+                               .TB_PREF."chart_master AS Chart1 ON tax_type.sales_gl_code = Chart1.account_code LEFT JOIN "
+                               .TB_PREF."chart_master AS Chart2 ON tax_type.purchasing_gl_code = Chart2.account_code";
+
+       if (!$all) $sql .= " AND !tax_type.inactive";
        return db_query($sql, "could not get all tax types");
 }
 
 function get_all_tax_types_simple()
 {
-       $sql = "SELECT * FROM ".TB_PREF."tax_types";
+       $sql = "SELECT * FROM ".TB_PREF."tax_types WHERE !inactive";
 
        return db_query($sql, "could not get all tax types");
 }
 
 function get_tax_type($type_id)
 {
-       $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 AND id=".db_escape($type_id);
+       $sql = "SELECT tax_type.*,
+                               Chart1.account_name AS SalesAccountName,
+                               Chart2.account_name AS PurchasingAccountName
+                       FROM ".TB_PREF."tax_types tax_type LEFT JOIN "
+                               .TB_PREF."chart_master AS Chart1 ON tax_type.sales_gl_code = Chart1.account_code LEFT JOIN "
+                               .TB_PREF."chart_master AS Chart2 ON tax_type.purchasing_gl_code = Chart2.account_code 
+                       WHERE id=".db_escape($type_id);
 
        $result = db_query($sql, "could not get tax type");
        return db_fetch($result);
@@ -71,7 +70,7 @@ function get_tax_type_rate($type_id)
        $result = db_query($sql, "could not get tax type rate");
 
        $row = db_fetch_row($result);
-       return $row[0];
+       return is_array($row) ? $row[0] : false;
 }
 
 function delete_tax_type($type_id)
@@ -101,9 +100,9 @@ function is_tax_gl_unique($gl_code, $gl_code2=-1, $selected_id=-1) {
        $purch_code = $gl_code2== -1 ? $gl_code : $gl_code2;
 
        $sql = "SELECT count(*) FROM "
-               .TB_PREF."tax_types     
+                       .TB_PREF."tax_types     
                WHERE (sales_gl_code=" .db_escape($gl_code)
-               ." OR purchasing_gl_code=" .db_escape($purch_code). ")";
+                       ." OR purchasing_gl_code=" .db_escape($purch_code). ")";
 
        if ($selected_id != -1)
                $sql .= " AND id!=".db_escape($selected_id);