Undefined 'no_zeroes' in rep115 line 235. Fixed.

[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 f7ed2eb1e87cab62907cbe18069402d04d7ef595..850b1f5b1372ac6a281d64ed58217bf64f7e7252 100644 (file)
--- a/taxes/db/tax_types_db.inc
+++ b/taxes/db/tax_types_db.inc
@@ -11,15 +11,18 @@
 ***********************************************************************/
 function add_tax_type($name, $sales_gl_code, $purchasing_gl_code, $rate)
 {
+       begin_transaction(__FUNCTION__, func_get_args());
        $sql = "INSERT INTO ".TB_PREF."tax_types (name, sales_gl_code, purchasing_gl_code, rate)
                VALUES (".db_escape($name).", ".db_escape($sales_gl_code)
                .", ".db_escape($purchasing_gl_code).", $rate)";
 
        db_query($sql, "could not add tax type");
+       commit_transaction();
 }
 
 function update_tax_type($type_id, $name, $sales_gl_code, $purchasing_gl_code, $rate)
 {
+       begin_transaction(__FUNCTION__, func_get_args());
        $sql = "UPDATE ".TB_PREF."tax_types SET name=".db_escape($name).",
                sales_gl_code=".db_escape($sales_gl_code).",
                purchasing_gl_code=".db_escape($purchasing_gl_code).",
@@ -27,38 +30,41 @@ function update_tax_type($type_id, $name, $sales_gl_code, $purchasing_gl_code, $
                WHERE id=".db_escape($type_id);
 
        db_query($sql, "could not update tax type");
+       commit_transaction();
 }
 
 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,"
+                               .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";
        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,"
+                               .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 AND id=".db_escape($type_id);
 
        $result = db_query($sql, "could not get tax type");
        return db_fetch($result);
@@ -76,14 +82,14 @@ function get_tax_type_rate($type_id)
 
 function delete_tax_type($type_id)
 {
-       begin_transaction();
+       begin_transaction(__FUNCTION__, func_get_args());
 
        $sql = "DELETE FROM ".TB_PREF."tax_types WHERE id=".db_escape($type_id);
 
        db_query($sql, "could not delete tax type");
 
        // also delete any item tax exemptions associated with this type
-       $sql = "DELETE FROM ".TB_PREF."item_tax_type_exemptions WHERE tax_type_id=$type_id";
+       $sql = "DELETE FROM ".TB_PREF."item_tax_type_exemptions WHERE tax_type_id=".db_escape($type_id);
 
        db_query($sql, "could not delete item tax type exemptions");
 
@@ -101,9 +107,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);
@@ -127,4 +133,3 @@ function is_tax_account($account_code)
 }
 
 
-?>
\ No newline at end of file