X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_account_types.inc;h=6dd5a5db422ae21cb531bdc789386f15be5e5c92;hb=508b54ee5cef13ac64f1532dfedfb7b242aa9077;hp=edf4334f85d8f175647a904622397533157bd8f4;hpb=54d84ff9a67620ab38c676cdbcf87853632724f0;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 edf4334f..6dd5a5db 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).", ".db_escape($class_id).", ".db_escape($parent).")";
 
-	db_query($sql, "could not add account type");
+	return db_query($sql);
 }
 
 function update_account_type($id, $name, $class_id, $parent)
@@ -23,12 +23,22 @@ function update_account_type($id, $name, $class_id, $parent)
 		class_id=".db_escape($class_id).", parent=".db_escape($parent)
 		." WHERE id = ".db_escape($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, $class_id=false, $parent=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";
+	if ($class_id != false) 
+		$sql .= " AND class_id=".db_escape($class_id);
+	if ($parent == -1) 
+		$sql .= " AND parent <= 0";
+	elseif ($parent != false) 
+		$sql .= " AND parent=".db_escape($parent);
+	$sql .= " ORDER BY class_id, id";
 
 	return db_query($sql, "could not get account types");
 }
@@ -59,27 +69,34 @@ 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 (".db_escape($id).", ".db_escape($name).", ".db_escape($balance).")";
+	$sql = "INSERT INTO ".TB_PREF."chart_class (cid, class_name, ctype)
+		VALUES (".db_escape($id).", ".db_escape($name).", ".db_escape($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=".db_escape($balance)." WHERE cid = ".db_escape($id);
+		ctype=".db_escape($ctype)." WHERE cid = ".db_escape($id);
 
-	db_query($sql, "could not update account type");
+	return db_query($sql);
 }
 
-function get_account_classes()
+function get_account_classes($all=false, $balance=-1)
 {
-	$sql = "SELECT * FROM ".TB_PREF."chart_class ORDER BY cid";
-
-	return db_query($sql, "could not get account types");
+	$sql = "SELECT * FROM ".TB_PREF."chart_class";
+	if (!$all) 
+		$sql .= " WHERE !inactive";
+	if ($balance == 0) 
+		$sql .= " AND ctype>".CL_EQUITY." OR ctype=0";
+	elseif ($balance == 1) 
+		$sql .= " AND ctype>0 AND ctype<".CL_INCOME; 
+	$sql .= " ORDER BY cid";
+
+	return db_query($sql, "could not get account classes");
 }
 
 function get_account_class($id)
@@ -108,5 +125,4 @@ function delete_account_class($id)
 	db_query($sql, "could not delete account type");
 }
 
-
 ?>
\ No newline at end of file