X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_accounts.inc;h=f085cfe84b8cd767374cefed78ae142634b78f7a;hb=5089910120614dfb8b76a0271b43739f90f38b01;hp=34bbdaabd1786c9b26131e4237515d1f0b6e791c;hpb=303eb17e9cdd9702eee9fdfcaee51e654a1da541;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 34bbdaab..f085cfe8 100644
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -50,31 +50,6 @@ function get_gl_accounts($from=null, $to=null, $type=null)
 	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);
@@ -113,22 +88,22 @@ function get_gl_account_name($code)
 
 function gl_account_in_company_defaults($acc)
 {
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act=$acc 
-		OR pyt_discount_act=$acc
-		OR creditors_act=$acc 
-		OR bank_charge_act=$acc 
-		OR exchange_diff_act=$acc
-		OR profit_loss_year_act=$acc
-		OR retained_earnings_act=$acc
-		OR freight_act=$acc
-		OR default_sales_act=$acc 
-		OR default_sales_discount_act=$acc
-		OR default_prompt_payment_act=$acc
-		OR default_inventory_act=$acc
-		OR default_cogs_act=$acc
-		OR default_adj_act=$acc
-		OR default_inv_sales_act=$acc
-		OR default_assembly_act=$acc";
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."sys_prefs WHERE (name='debtors_act' 
+		OR name='pyt_discount_act'
+		OR name='creditors_act' 
+		OR name='bank_charge_act' 
+		OR name='exchange_diff_act'
+		OR name='profit_loss_year_act'
+		OR name='retained_earnings_act'
+		OR name='freight_act'
+		OR name='default_sales_act' 
+		OR name='default_sales_discount_act'
+		OR name='default_prompt_payment_act'
+		OR name='default_inventory_act'
+		OR name='default_cogs_act'
+		OR name='default_adj_act'
+		OR name='default_inv_sales_act'
+		OR name='default_assembly_act') AND value=$acc";
 	$result = db_query($sql,"Couldn't test for default company GL codes");
 
 	$myrow = db_fetch_row($result);