X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=221a76cd28e8d7944f1fc84157fa7c12372f8f6f;hb=aa2ff78063656a7843d763859e3b9b4c15a3f920;hp=8944d385f35a311682e97a83e49197f0a969d0e5;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index 8944d385..221a76cd 100644
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -12,7 +12,7 @@
 $page_security = 'SA_GLACCOUNT';
 $path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
-
+ 
 page(_($help_context = "Chart of Accounts"));
 
 include($path_to_root . "/includes/ui.inc");
@@ -76,7 +76,11 @@ if (isset($_POST['add']) || isset($_POST['update']))
 
     	if ($selected_account) 
 		{
-    		if (update_gl_account($_POST['account_code'], $_POST['account_name'], 
+			if (get_post('inactive') == 1 && is_bank_account($_POST['account_code']))
+			{
+				display_error(_("The account belongs to a bank account and cannot be inactivated."));
+			}	
+    		elseif (update_gl_account($_POST['account_code'], $_POST['account_name'], 
 				$_POST['account_type'], $_POST['account_code2'])) {
 				update_record_status($_POST['account_code'], $_POST['inactive'],
 					'chart_master', 'account_code');
@@ -106,61 +110,60 @@ function can_delete($selected_account)
 {
 	if ($selected_account == "")
 		return false;
-	$acc = db_escape($selected_account);
 
-	if (key_in_foreign_table($acc, 'gl_trans', 'account', true))
+	if (key_in_foreign_table($selected_account, 'gl_trans', 'account'))
 	{
 		display_error(_("Cannot delete this account because transactions have been created using this account."));
 		return false;
 	}
 
-	if (gl_account_in_company_defaults($acc))
+	if (gl_account_in_company_defaults($selected_account))
 	{
 		display_error(_("Cannot delete this account because it is used as one of the company default GL accounts."));
 		return false;
 	}
 
-	if (key_in_foreign_table($acc, 'bank_accounts', 'account_code', true))	
+	if (key_in_foreign_table($selected_account, 'bank_accounts', 'account_code'))
 	{
 		display_error(_("Cannot delete this account because it is used by a bank account."));
 		return false;
 	}	
 
-	if (gl_account_in_stock_category($acc))
+	if (gl_account_in_stock_category($selected_account))
 	{
 		display_error(_("Cannot delete this account because it is used by one or more Item Categories."));
 		return false;
 	}	
 	
-	if (gl_account_in_stock_master($acc))
+	if (gl_account_in_stock_master($selected_account))
 	{
 		display_error(_("Cannot delete this account because it is used by one or more Items."));
 		return false;
 	}	
 	
-	if (gl_account_in_tax_types($acc))
+	if (gl_account_in_tax_types($selected_account))
 	{
 		display_error(_("Cannot delete this account because it is used by one or more Taxes."));
 		return false;
 	}	
 	
-	if (gl_account_in_cust_branch($acc))
+	if (gl_account_in_cust_branch($selected_account))
 	{
 		display_error(_("Cannot delete this account because it is used by one or more Customer Branches."));
 		return false;
 	}		
 	
-	if (gl_account_in_suppliers($acc))
+	if (gl_account_in_suppliers($selected_account))
 	{
 		display_error(_("Cannot delete this account because it is used by one or more suppliers."));
 		return false;
-	}									
-	
-	if (gl_account_in_quick_entry_lines($acc))
+	}
+
+	if (gl_account_in_quick_entry_lines($selected_account))
 	{
 		display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines."));
 		return false;
-	}									
+	}
 
 	return true;
 }