X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_accounts.inc;h=685619736746e6bffbd9b152d5adf4ed95f8c3d0;hb=883307779f9ca5bac0533702a8702b0cccb4742f;hp=279a55bee2fb93dd42b71a6b3c831cbd8a3900a2;hpb=cc9972b02f2bf4ece12da3431266e85e96872fb1;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 279a55be..68561973 100644
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -50,6 +50,8 @@ function get_gl_accounts($from=null, $to=null)
 
 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)	
@@ -62,8 +64,11 @@ function get_gl_accounts_all($balance=-1)
 	 	LEFT JOIN ".TB_PREF."chart_master ON ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id ";
 	if ($balance != -1)
 		$sql .= $where; 	 	 		
-	 $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";
+	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");
 }