X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=5bda0dcdff4047d4e6daa5d6b1886fc0b3e8556c;hb=f425362379fe66e2b0f17b6e4f09d8d9bdf6c5f2;hp=c47abcc8409fe41381a064165f632ab5c9a68609;hpb=78fe8cb8f56510ba3f6a1720b207a33b5828e071;p=fa-stable.git

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index c47abcc8..5bda0dcd 100644
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -13,7 +13,11 @@ $page_security = 'SA_GLACCOUNT';
 $path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
-page(_($help_context = "Chart of Accounts"));
+$js = "";
+if ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search)
+	$js .= get_js_open_window(900, 500);
+
+page(_($help_context = "Chart of Accounts"), false, false, "", $js);
 
 include($path_to_root . "/includes/ui.inc");
 include($path_to_root . "/gl/includes/gl_db.inc");
@@ -59,16 +63,15 @@ if (isset($_POST['add']) || isset($_POST['update']))
 		display_error( _("The account name cannot be empty."));
 		set_focus('account_name');
 	} 
-	elseif (!$accounts_alpha && !is_numeric($_POST['account_code'])) 
+	elseif (!$SysPrefs->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)
+		if ($SysPrefs->accounts_alpha() == 2)
 			$_POST['account_code'] = strtoupper($_POST['account_code']);
 
 		if (!isset($_POST['account_tags']))
@@ -99,6 +102,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');
 	}
@@ -111,7 +116,7 @@ function can_delete($selected_account)
 	if ($selected_account == "")
 		return false;
 
-	if (key_in_foreign_table($selected_account, '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;
@@ -123,7 +128,7 @@ function can_delete($selected_account)
 		return false;
 	}
 
-	if (key_in_foreign_table($selected_account, '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;
@@ -263,4 +268,3 @@ end_form();
 
 end_page();
 
-?>