X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_account_types.inc;h=e82ee8dfa88fffd441609c398d1da4b79a022cd1;hb=56631aa65f39f4f2471f1e31350f5b6c912cabbf;hp=21a8c2ce81eead5437a5c266e1435da92dc73cf4;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_account_types.inc b/gl/includes/db/gl_db_account_types.inc
index 21a8c2ce..e82ee8df 100644
--- 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)
+function add_account_class($id, $name, $ctype)
 {
-	$sql = "INSERT INTO ".TB_PREF."chart_class (cid, class_name, balance_sheet)
-		VALUES ($id, ".db_escape($name).", $balance)";
+	$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)
+function update_account_class($id, $name, $ctype)
 {
     $sql = "UPDATE ".TB_PREF."chart_class SET class_name=".db_escape($name).",
-		balance_sheet=$balance 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,7 +105,6 @@ function get_account_class_name($id)
 	return $row[0];
 }
 
-
 function delete_account_class($id)
 {
 	$sql = "DELETE FROM ".TB_PREF."chart_class WHERE cid = $id";
@@ -109,5 +112,4 @@ function delete_account_class($id)
 	db_query($sql, "could not delete account type");
 }
 
-
 ?>
\ No newline at end of file