X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_account_types.inc;h=94d27fccffb0028e25c2149a56a6b3f9c2d02208;hb=02dd4aefa3e3babb64d61140bb7f7de14e37f755;hp=e82ee8dfa88fffd441609c398d1da4b79a022cd1;hpb=56631aa65f39f4f2471f1e31350f5b6c912cabbf;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 e82ee8df..94d27fcc 100644
--- a/gl/includes/db/gl_db_account_types.inc
+++ b/gl/includes/db/gl_db_account_types.inc
@@ -12,17 +12,44 @@
 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).")";
 
 	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";
-
-	return 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($all=false)
@@ -30,14 +57,14 @@ function get_account_types($all=false)
 	$sql = "SELECT * FROM ".TB_PREF."chart_types";
 
 	if (!$all) $sql .= " WHERE !inactive";
-	$sql .= " ORDER BY class_id, id";
+	$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");
 
@@ -46,7 +73,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");
 
@@ -56,7 +83,7 @@ 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");
 }
@@ -64,7 +91,7 @@ function delete_account_type($id)
 function add_account_class($id, $name, $ctype)
 {
 	$sql = "INSERT INTO ".TB_PREF."chart_class (cid, class_name, ctype)
-		VALUES ($id, ".db_escape($name).", $ctype)";
+		VALUES (".db_escape($id).", ".db_escape($name).", ".db_escape($ctype).")";
 
 	return db_query($sql);
 }
@@ -72,7 +99,7 @@ function add_account_class($id, $name, $ctype)
 function update_account_class($id, $name, $ctype)
 {
     $sql = "UPDATE ".TB_PREF."chart_class SET class_name=".db_escape($name).",
-		ctype=$ctype WHERE cid = $id";
+		ctype=".db_escape($ctype)." WHERE cid = ".db_escape($id);
 
 	return db_query($sql);
 }
@@ -81,14 +108,14 @@ function get_account_classes($all=false)
 {
 	$sql = "SELECT * FROM ".TB_PREF."chart_class";
 	if (!$all) $sql .= " WHERE !inactive";
-	$sql .= " ORDER BY cid";
+	$sql .= " ORDER BY ctype, 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");
 
@@ -97,7 +124,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");
 
@@ -107,7 +134,7 @@ function get_account_class_name($id)
 
 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");
 }