Fixed broken table editor page layout on duplicate record error.

[fa-stable.git] / gl / includes / db / gl_db_account_types.inc

diff --git a/gl/includes/db/gl_db_account_types.inc b/gl/includes/db/gl_db_account_types.inc
index 82de20a4a12c9c46f77d18d9df30758e4174121d..e82ee8dfa88fffd441609c398d1da4b79a022cd1 100644 (file)
--- a/gl/includes/db/gl_db_account_types.inc
+++ b/gl/includes/db/gl_db_account_types.inc
@@ -14,7 +14,7 @@ function add_account_type($id, $name, $class_id, $parent)
        $sql = "INSERT INTO ".TB_PREF."chart_types (id, name, class_id, parent)
                VALUES ($id, ".db_escape($name).", $class_id, $parent)";
 
-       db_query($sql, "could not add account type");
+       return db_query($sql);
 }
 
 function update_account_type($id, $name, $class_id, $parent)
@@ -22,12 +22,15 @@ function update_account_type($id, $name, $class_id, $parent)
     $sql = "UPDATE ".TB_PREF."chart_types SET name=".db_escape($name).",
                class_id=$class_id,     parent=$parent WHERE id = $id";
 
-       db_query($sql, "could not update account type");
+       return db_query($sql, "could not update account type");
 }
 
-function get_account_types()
+function get_account_types($all=false)
 {
-       $sql = "SELECT * FROM ".TB_PREF."chart_types ORDER BY class_id, id";
+       $sql = "SELECT * FROM ".TB_PREF."chart_types";
+
+       if (!$all) $sql .= " WHERE !inactive";
+       $sql .= " ORDER BY class_id, id";
 
        return db_query($sql, "could not get account types");
 }
@@ -51,7 +54,6 @@ function get_account_type_name($id)
        return $row[0];
 }
 
-
 function delete_account_type($id)
 {
        $sql = "DELETE FROM ".TB_PREF."chart_types WHERE id = $id";
@@ -59,25 +61,27 @@ function delete_account_type($id)
        db_query($sql, "could not delete account type");
 }
 
-function add_account_class($id, $name, $balance, $sign_conv)
+function add_account_class($id, $name, $ctype)
 {
-       $sql = "INSERT INTO ".TB_PREF."chart_class (cid, class_name, balance_sheet, sign_convert)
-               VALUES ($id, ".db_escape($name).", $balance, $sign_conv)";
+       $sql = "INSERT INTO ".TB_PREF."chart_class (cid, class_name, ctype)
+               VALUES ($id, ".db_escape($name).", $ctype)";
 
-       db_query($sql, "could not add account type");
+       return db_query($sql);
 }
 
-function update_account_class($id, $name, $balance, $sign_conv)
+function update_account_class($id, $name, $ctype)
 {
     $sql = "UPDATE ".TB_PREF."chart_class SET class_name=".db_escape($name).",
-               balance_sheet=$balance, sign_convert=$sign_conv WHERE cid = $id";
+               ctype=$ctype WHERE cid = $id";
 
-       db_query($sql, "could not update account type");
+       return db_query($sql);
 }
 
-function get_account_classes()
+function get_account_classes($all=false)
 {
-       $sql = "SELECT * FROM ".TB_PREF."chart_class ORDER BY cid";
+       $sql = "SELECT * FROM ".TB_PREF."chart_class";
+       if (!$all) $sql .= " WHERE !inactive";
+       $sql .= " ORDER BY cid";
 
        return db_query($sql, "could not get account types");
 }
@@ -101,16 +105,6 @@ function get_account_class_name($id)
        return $row[0];
 }
 
-function get_sign_convert($account_type)
-{
-       $sql = "SELECT sign_convert FROM ".TB_PREF."chart_class INNER JOIN ".TB_PREF."chart_types ON 
-               ".TB_PREF."chart_class.cid = ".TB_PREF."chart_types.class_id WHERE ".TB_PREF."chart_types.id=$account_type";
-       $result = db_query($sql, "could not get sign convert");
-
-       $row = db_fetch_row($result);
-       return ($row[0]==1);
-}
-               
 function delete_account_class($id)
 {
        $sql = "DELETE FROM ".TB_PREF."chart_class WHERE cid = $id";
@@ -118,5 +112,4 @@ function delete_account_class($id)
        db_query($sql, "could not delete account type");
 }
 
-
 ?>
\ No newline at end of file