X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=900bf3668382403b11acfff1591896e5e191ba41;hb=6108acadfe6369362f469909f8dac47c17d21322;hp=5a277c6ae0640d0f020f2317159d3cbee93c2a76;hpb=0bf933423b9645bcb57390c478d4fdaf0c895049;p=fa-stable.git

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index 5a277c6a..900bf366 100644
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -108,7 +108,7 @@ function can_delete($selected_account)
 		return false;
 	$acc = db_escape($selected_account);
 
-	if (gl_account_in_transactions($acc))
+	if (key_in_foreign_table($acc, 'gl_trans', 'account', true))
 	{
 		display_error(_("Cannot delete this account because transactions have been created using this account."));
 		return false;
@@ -119,8 +119,8 @@ function can_delete($selected_account)
 		display_error(_("Cannot delete this account because it is used as one of the company default GL accounts."));
 		return false;
 	}
-	
-	if (gl_account_in_bank_accounts($acc))
+
+	if (key_in_foreign_table($acc, 'bank_accounts', 'account_code', true))	
 	{
 		display_error(_("Cannot delete this account because it is used by a bank account."));
 		return false;
@@ -188,7 +188,7 @@ start_form();
 
 if (db_has_gl_accounts()) 
 {
-	start_table("class = 'tablestyle_noborder'");
+	start_table(TABLESTYLE_NOBORDER);
 	start_row();
     gl_all_accounts_list_cells(null, 'AccountList', null, false, false,
 		_('New account'), true, check_value('show_inactive'));
@@ -202,7 +202,7 @@ if (db_has_gl_accounts())
 }
 	
 br(1);
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_account != "") 
 {
@@ -234,10 +234,10 @@ else
 		$_POST['account_name']	= $_POST['account_type'] = '';
  		$_POST['inactive'] = 0;
 	}
-	text_row_ex(_("Account Code:"), 'account_code', 11);
+	text_row_ex(_("Account Code:"), 'account_code', 15);
 }
 
-text_row_ex(_("Account Code 2:"), 'account_code2', 11);
+text_row_ex(_("Account Code 2:"), 'account_code2', 15);
 
 text_row_ex(_("Account Name:"), 'account_name', 60);