X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fincludes%2Fdb%2Fgl_db_accounts.inc;h=00b8fbe34698076501bd17479bf01c3a7ddda7ea;hb=c164d1f25c5258939976042fa8796b71ac54c188;hp=921d53f1f5039172f7306be29aafcc895c75b7e7;hpb=5838404faacacbe4f77dd77bc1cd88fabc213a02;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 921d53f1..00b8fbe3 100644
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -96,6 +96,7 @@ function gl_account_in_company_defaults($acc)
 		OR name='profit_loss_year_act'
 		OR name='retained_earnings_act'
 		OR name='freight_act'
+		OR name='deferred_income_act'
 		OR name='default_sales_act' 
 		OR name='default_sales_discount_act'
 		OR name='default_prompt_payment_act'
@@ -112,6 +113,8 @@ function gl_account_in_company_defaults($acc)
 
 function gl_account_in_stock_category($acc)
 {
+	$acc = db_escape($acc);
+
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_category WHERE 
 		dflt_inventory_act=$acc 
 		OR dflt_cogs_act=$acc
@@ -125,6 +128,8 @@ function gl_account_in_stock_category($acc)
 
 function gl_account_in_stock_master($acc)
 {
+	$acc = db_escape($acc);
+
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE 
 		inventory_account=$acc 
 		OR cogs_account=$acc
@@ -138,6 +143,8 @@ function gl_account_in_stock_master($acc)
 
 function gl_account_in_tax_types($acc)
 {
+	$acc = db_escape($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");
 
@@ -147,6 +154,8 @@ function gl_account_in_tax_types($acc)
 
 function gl_account_in_cust_branch($acc)
 {
+	$acc = db_escape($acc);
+
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE 
 		sales_account=$acc 
 		OR sales_discount_account=$acc
@@ -160,6 +169,8 @@ function gl_account_in_cust_branch($acc)
 
 function gl_account_in_suppliers($acc)
 {
+	$acc = db_escape($acc);
+
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE 
 		purchase_account=$acc
 		OR payment_discount_account=$acc
@@ -172,6 +183,8 @@ function gl_account_in_suppliers($acc)
 
 function gl_account_in_quick_entry_lines($acc)
 {
+	$acc = db_escape($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");
@@ -183,15 +196,15 @@ function gl_account_in_quick_entry_lines($acc)
 //	Returns n>0 when account is AR, n<0 when account is AP
 //  (priority for AR accounts)
 //
- function is_subledger_account($account)
- {
+function is_subledger_account($account)
+{
 	$sql = "SELECT 1 FROM ".TB_PREF."cust_branch WHERE receivables_account=".db_escape($account)
 	." UNION SELECT -1 FROM ".TB_PREF."suppliers WHERE payable_account=".db_escape($account);
 
- 	$result = db_query($sql,"Couldn't test AR/AP account");
- 	$myrow = db_fetch_row($result);
- 	return $myrow[0];
- }
+	$result = db_query($sql,"Couldn't test AR/AP account");
+	$myrow = db_fetch_row($result);
+	return $myrow[0];
+}
 
 function get_subaccount_name($code_id, $person_id)
 {
@@ -214,4 +227,22 @@ function gl_account_in_bank_accounts($acc)
 	$myrow = db_fetch_row($result);
 	return ($myrow[0] > 0); 
 }
-?>
\ No newline at end of file
+
+//----------------------------------------------------------------------------------
+//	Check if given account is used by any bank_account. 
+//	Returns id of first bank_account using account_code, null otherwise.
+//
+//	Keep in mind that direct posting to bank account is depreciated
+//	because we have no way to select right bank account if 
+//	there is more than one using given gl account.
+//
+function is_bank_account($account_code)
+{
+	$sql= "SELECT id FROM ".TB_PREF."bank_accounts WHERE account_code=".db_escape($account_code);
+	$result = db_query($sql, "checking account is bank account");
+	if (db_num_rows($result) > 0) {
+		$acct = db_fetch($result);
+		return $acct['id'];
+	} else
+		return false;
+}