X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fmanage%2Fgl_accounts.php;h=0d9b2c755ea1ba9b1d2044500eefea3d46040a29;hb=fe97ad7097366fe3de8770fb5110e9c447dbc58c;hp=5d918cc8e8a1e559635abd2d8756a4a98c27e1b6;hpb=e05281d838989a2e05b5f916a0bacd6d3f2cc3f0;p=fa-stable.git

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index 5d918cc8..0d9b2c75 100644
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -58,14 +58,13 @@ if (isset($_POST['add']) || isset($_POST['update']))
 		$input_error = 1;
 		display_error( _("The account name cannot be empty."));
 		set_focus('account_name');
-	} 
-	elseif (!$accounts_alpha && !is_numeric($_POST['account_code'])) 
+	}  
+	elseif (!$accounts_alpha && !preg_match("/^[0-9.]+$/",$_POST['account_code'])) // we only allow 0-9 and a dot
 	{
 	    $input_error = 1;
 	    display_error( _("The account code must be numeric."));
 		set_focus('account_code');
 	}
-
 	if ($input_error != 1)
 	{
 		if ($accounts_alpha == 2)
@@ -76,7 +75,7 @@ if (isset($_POST['add']) || isset($_POST['update']))
 
     	if ($selected_account) 
 		{
-			if (check_value('inactive') && is_bank_account($_POST['account_code']))
+			if (get_post('inactive') == 1 && is_bank_account($_POST['account_code']))
 			{
 				display_error(_("The account belongs to a bank account and cannot be inactivated."));
 			}	
@@ -99,6 +98,8 @@ if (isset($_POST['add']) || isset($_POST['update']))
 					display_notification(_("New account has been added."));
 					$selected_account = $_POST['AccountList'] = $_POST['account_code'];
 				}
+			else
+                 display_error(_("Account not added, possible duplicate Account Code."));
 		}
 		$Ajax->activate('_page_body');
 	}
@@ -110,61 +111,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;
 }