X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_account_types.inc;h=76d41ede72281a29ecc44dce8aa9bcb2ee8e8d21;hb=9451db1760036985de791ba24c442801e37f37de;hp=5f1da519747d5a5b7e5c14c99d739ca2d49254d7;hpb=daf0fe2200659df7403c2f51855795b014c420b5;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 5f1da519..76d41ede 100644
--- a/gl/includes/db/gl_db_account_types.inc
+++ b/gl/includes/db/gl_db_account_types.inc
@@ -56,14 +56,21 @@ function get_account_types($all=false, $class_id=false, $parent=false)
 {
 	$sql = "SELECT * FROM ".TB_PREF."chart_types";
 
-	if (!$all) 
-		$sql .= " WHERE !inactive";
-	if ($class_id != false) 
-		$sql .= " AND class_id=".db_escape($class_id);
+	$where = array();
+	
+	if (!$all)
+		$where[] = "!inactive";
+
+	if ($class_id != false)  
+		$where[] = "class_id=".db_escape($class_id);
+
 	if ($parent == -1) 
-		$sql .= " AND (parent = '' OR parent = '-1')";
-	elseif ($parent != false) 
-		$sql .= " AND parent=".db_escape($parent);
+		$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");
@@ -152,4 +159,3 @@ function delete_account_class($id)
 	db_query($sql, "could not delete account type");
 }
 
-?>
\ No newline at end of file