X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fincludes%2Fdb%2Fgl_db_account_types.inc;h=1c25db71a5a7e8fc140ee655fac052f72c84aae6;hb=ebc600101ceab69c06eac4b1bd4d1782af45de05;hp=d731b80b66cbb4aa83d64a08528d6d79030434a1;hpb=1a5b277431e6804654cbca16aaed5ee3a5a729eb;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 d731b80b..1c25db71 100644
--- a/gl/includes/db/gl_db_account_types.inc
+++ b/gl/includes/db/gl_db_account_types.inc
@@ -12,29 +12,33 @@
 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)";
+		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)
 {
     $sql = "UPDATE ".TB_PREF."chart_types SET name=".db_escape($name).",
-		class_id=$class_id,	parent=$parent WHERE id = $id";
+		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)
 {
-	$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");
 }
 
 function get_account_type($id)
 {
-	$sql = "SELECT * FROM ".TB_PREF."chart_types WHERE id = $id";
+	$sql = "SELECT * FROM ".TB_PREF."chart_types WHERE id = ".db_escape($id);
 
 	$result = db_query($sql, "could not get account type");
 
@@ -43,7 +47,7 @@ function get_account_type($id)
 
 function get_account_type_name($id)
 {
-	$sql = "SELECT name FROM ".TB_PREF."chart_types WHERE id = $id";
+	$sql = "SELECT name FROM ".TB_PREF."chart_types WHERE id = ".db_escape($id);
 
 	$result = db_query($sql, "could not get account type");
 
@@ -53,37 +57,39 @@ function get_account_type_name($id)
 
 function delete_account_type($id)
 {
-	$sql = "DELETE FROM ".TB_PREF."chart_types WHERE id = $id";
+	$sql = "DELETE FROM ".TB_PREF."chart_types WHERE id = ".db_escape($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 (".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=$balance WHERE cid = $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)
 {
-	$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");
 }
 
 function get_account_class($id)
 {
-	$sql = "SELECT * FROM ".TB_PREF."chart_class WHERE cid = $id";
+	$sql = "SELECT * FROM ".TB_PREF."chart_class WHERE cid = ".db_escape($id);
 
 	$result = db_query($sql, "could not get account type");
 
@@ -92,7 +98,7 @@ function get_account_class($id)
 
 function get_account_class_name($id)
 {
-	$sql = "SELECT class_name FROM ".TB_PREF."chart_class WHERE cid = $id";
+	$sql = "SELECT class_name FROM ".TB_PREF."chart_class WHERE cid =".db_escape($id);
 
 	$result = db_query($sql, "could not get account type");
 
@@ -100,23 +106,11 @@ function get_account_class_name($id)
 	return $row[0];
 }
 
-function get_account_class_convert($id)
-{
-	global $class_types;
-	$sql = "SELECT balance_sheet FROM ".TB_PREF."chart_class WHERE cid = $id";
-
-	$result = db_query($sql, "could not get class type");
-
-	$row = db_fetch_row($result);
-	return (($row[0] == CL_LIABILITIES || $row[0] == CL_EQUITY || $row[0] == CL_INCOME || $row[0] == 0) ? -1 : 1); // backwards compatibility
-}
-
 function delete_account_class($id)
 {
-	$sql = "DELETE FROM ".TB_PREF."chart_class WHERE cid = $id";
+	$sql = "DELETE FROM ".TB_PREF."chart_class WHERE cid = ".db_escape($id);
 
 	db_query($sql, "could not delete account type");
 }
 
-
 ?>
\ No newline at end of file