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

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 0fb50ea0..68561973 100644
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -11,7 +11,6 @@
 ***********************************************************************/
 function add_gl_account($account_code, $account_name, $account_type, $account_code2)
 {
-	$account_name = db_escape($account_name);
 	$sql = "INSERT INTO ".TB_PREF."chart_master (account_code, account_code2, account_name, account_type)
 		VALUES (".db_escape($account_code).", ".db_escape($account_code2).", "
 			.db_escape($account_name).", ".db_escape($account_type).")";
@@ -21,7 +20,6 @@ function add_gl_account($account_code, $account_name, $account_type, $account_co
 
 function update_gl_account($account_code, $account_name, $account_type, $account_code2)
 {
-	$account_name = db_escape($account_name);
     $sql = "UPDATE ".TB_PREF."chart_master SET account_name=".db_escape($account_name)
     .",account_type=".db_escape($account_type).", account_code2=".db_escape($account_code2)
 		." WHERE account_code = ".db_escape($account_code);
@@ -52,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)	
@@ -64,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");
 }
@@ -106,5 +109,97 @@ function get_gl_account_name($code)
 	display_db_error("could not retreive the account name for $code", $sql, true);
 }
 
+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";
+	$result = db_query($sql,"Couldn't test for default company GL codes");
+
+	$myrow = db_fetch_row($result);
+	return ($myrow[0] > 0); 
+}
+
+function gl_account_in_stock_category($acc)
+{
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_category WHERE 
+		dflt_inventory_act=$acc 
+		OR dflt_cogs_act=$acc
+		OR dflt_adjustment_act=$acc 
+		OR dflt_sales_act=$acc";
+	$result = db_query($sql,"Couldn't test for existing stock category GL codes");
+
+	$myrow = db_fetch_row($result);
+	return ($myrow[0] > 0); 
+}
 
+function gl_account_in_stock_master($acc)
+{
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE 
+		inventory_account=$acc 
+		OR cogs_account=$acc
+		OR adjustment_account=$acc 
+		OR sales_account=$acc";
+	$result = db_query($sql,"Couldn't test for existing stock GL codes");
+
+	$myrow = db_fetch_row($result);
+	return ($myrow[0] > 0); 
+}
+
+function gl_account_in_tax_types($acc)
+{
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_types WHERE sales_gl_code=$acc OR purchasing_gl_code=$acc";
+	$result = db_query($sql,"Couldn't test for existing tax GL codes");
+
+	$myrow = db_fetch_row($result);
+	return ($myrow[0] > 0); 
+}
+
+function gl_account_in_cust_branch($acc)
+{
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE 
+		sales_account=$acc 
+		OR sales_discount_account=$acc
+		OR receivables_account=$acc
+		OR payment_discount_account=$acc";
+	$result = db_query($sql,"Couldn't test for existing cust branch GL codes");
+
+	$myrow = db_fetch_row($result);
+	return ($myrow[0] > 0); 
+}
+
+function gl_account_in_suppliers($acc)
+{
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE 
+		purchase_account=$acc
+		OR payment_discount_account=$acc
+		OR payable_account=$acc";
+	$result = db_query($sql,"Couldn't test for existing suppliers GL codes");
+
+	$myrow = db_fetch_row($result);
+	return ($myrow[0] > 0); 
+}
+
+function gl_account_in_quick_entry_lines($acc)
+{
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."quick_entry_lines WHERE 
+		dest_id=$acc AND UPPER(LEFT(action, 1)) <> 'T'";
+	$result = db_query($sql,"Couldn't test for existing Quick Entry Line GL codes");
+
+	$myrow = db_fetch_row($result);
+	return ($myrow[0] > 0); 
+}
 ?>
\ No newline at end of file