X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_accounts.inc;h=70ef323638ca30f821c65a3b813f2eab51cdf4c5;hb=6f8094c63f914fce9fcfd02780c452d712a2dba3;hp=ee4d4c73bef7ee8bf6863a38a1df19c0def7d1ab;hpb=df444f84379276fbc46eddca894ed3529120b2bb;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index ee4d4c73..70ef3236 100644
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -34,7 +34,7 @@ function delete_gl_account($code)
 	db_query($sql, "could not delete gl account");
 }
 
-function get_gl_accounts($from=null, $to=null)
+function get_gl_accounts($from=null, $to=null, $type=null)
 {
 	$sql = "SELECT ".TB_PREF."chart_master.*,".TB_PREF."chart_types.name AS AccountTypeName
 		FROM ".TB_PREF."chart_master,".TB_PREF."chart_types
@@ -43,36 +43,13 @@ function get_gl_accounts($from=null, $to=null)
 		$sql .= " AND ".TB_PREF."chart_master.account_code >= ".db_escape($from);
 	if ($to != null)
 		$sql .= " AND ".TB_PREF."chart_master.account_code <= ".db_escape($to);
+	if ($type != null)
+		$sql .= " AND account_type=".db_escape($type);
 	$sql .= " ORDER BY account_code";
 
 	return db_query($sql, "could not get gl accounts");
 }
 
-function get_gl_accounts_all($balance=-1)
-{
-	global $use_new_account_types;
-	
-	if ($balance == 1)
-		$where ="WHERE ctype>0 AND ctype<".CL_INCOME;
-	elseif ($balance == 0)	
-		$where ="WHERE ctype>".CL_EQUITY." OR ctype=0"; // backwards compatibility
- 	$sql = "SELECT ".TB_PREF."chart_master.account_code, ".TB_PREF."chart_master.account_name, ".TB_PREF."chart_master.account_code2,
- 		".TB_PREF."chart_types.name AS AccountTypeName,".TB_PREF."chart_types.id AS AccountType,
-	 	".TB_PREF."chart_types.parent, ".TB_PREF."chart_class.class_name AS AccountClassName, ".TB_PREF."chart_class.cid AS ClassID, 
-	 	".TB_PREF."chart_class.ctype AS ClassType
-	 	FROM ".TB_PREF."chart_types INNER JOIN ".TB_PREF."chart_class ON ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid
-	 	LEFT JOIN ".TB_PREF."chart_master ON ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id ";
-	if ($balance != -1)
-		$sql .= $where; 	 	 		
-	if (isset($use_new_account_types) && $use_new_account_types == 1)
-	 	$sql .= " ORDER BY ".TB_PREF."chart_class.cid, ".TB_PREF."chart_types.id, parent, ".TB_PREF."chart_master.account_code";
-	else
-	 	$sql .= " ORDER BY ".TB_PREF."chart_class.cid, IF(parent > 0,parent,".TB_PREF."chart_types.id), 
-	 		IF(parent > 0,".TB_PREF."chart_types.id, parent), ".TB_PREF."chart_master.account_code";
-
-	return db_query($sql, "could not get gl accounts");
-}
-
 function get_gl_account($code)
 {
 	$sql = "SELECT * FROM ".TB_PREF."chart_master WHERE account_code=".db_escape($code);