X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_account_types.inc;h=03a3abeb293b826c78e2f7d915f055a2ef4309f9;hb=c587e204ffa7c53378bc385c9609ccc3e60ec6cf;hp=21a8c2ce81eead5437a5c266e1435da92dc73cf4;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;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..03a3abeb 100644
--- a/gl/includes/db/gl_db_account_types.inc
+++ b/gl/includes/db/gl_db_account_types.inc
@@ -12,29 +12,73 @@
 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 (".db_escape($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)
+function update_account_type($id, $name, $class_id, $parent, $old_id)
 {
-    $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");
+	begin_transaction();
+	if ($old_id !== $id)
+	{
+		$sql = "SELECT id FROM ".TB_PREF."chart_types WHERE parent = ".db_escape($old_id);
+
+		$result = db_query($sql, "could not get account type");
+
+		while ($myrow = db_fetch($result))
+		{
+    		$sql = "UPDATE ".TB_PREF."chart_types SET parent=".db_escape($id)
+				." WHERE id = '".$myrow['id']."'";
+			db_query($sql, "could not update account type");
+		}
+		$sql = "SELECT account_code FROM ".TB_PREF."chart_master WHERE account_type = ".db_escape($old_id);
+
+		$result = db_query($sql, "could not get account");
+
+		while ($myrow = db_fetch($result))
+		{
+    		$sql = "UPDATE ".TB_PREF."chart_master SET account_type=".db_escape($id)
+				." WHERE account_code = '".$myrow['account_code']."'";
+			db_query($sql, "could not update account");
+		}
+	}
+    $sql = "UPDATE ".TB_PREF."chart_types SET id=".db_escape($id) .", name=".db_escape($name).",
+		class_id=".db_escape($class_id).", parent=".db_escape($parent)
+		." WHERE id = ".db_escape($old_id);
+
+	$ret = db_query($sql, "could not update account type");
+	commit_transaction();
+	return $ret;
 }
 
-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";
+
+	$where = array();
+	
+	if (!$all)
+		$where[] = "!inactive";
+
+	if ($class_id != false)  
+		$where[] = "class_id=".db_escape($class_id);
+
+	if ($parent == -1) 
+		$where[] ="(parent = '' OR parent = '-1')";
+	elseif ($parent !== false) 
+		$where[] = "parent=".db_escape($parent);
+
+	if (count($where))
+		$sql .= ' WHERE '.implode(' AND ', $where);
+	$sql .= " ORDER BY class_id, id, parent";
 
 	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 +87,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");
 
@@ -51,40 +95,47 @@ function get_account_type_name($id)
 	return $row[0];
 }
 
-
 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, $balance=-1)
 {
-	$sql = "SELECT * FROM ".TB_PREF."chart_class ORDER BY cid";
+	$sql = "SELECT * FROM ".TB_PREF."chart_class";
 
-	return db_query($sql, "could not get account types");
+	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 ctype, cid";
+
+	return db_query($sql, "could not get account classes");
 }
 
 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");
 
@@ -93,7 +144,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");
 
@@ -101,13 +152,11 @@ function get_account_class_name($id)
 	return $row[0];
 }
 
-
 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