X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=df1f3df88849555ecfe8f6affdbff136ced009a4;hb=0414e70dba24e2186c3ed3ffbcee3c6cd296742c;hp=9ff0fa7a73c906d28f88edbf0e81cf70221c0d6f;hpb=9e8f7958e937c24a1b0ca859bbca8455e0b41404;p=fa-stable.git

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index 9ff0fa7a..df1f3df8 100644
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -41,20 +41,25 @@ if (isset($_POST['add']) || isset($_POST['update']))
 	{
 		$input_error = 1;
 		display_error( _("The account code must be entered."));
+		set_focus('account_code');
 	} 
 	elseif (strlen($_POST['account_name']) == 0) 
 	{
 		$input_error = 1;
 		display_error( _("The account name cannot be empty."));
+		set_focus('account_name');
 	} 
-	elseif (!is_numeric($_POST['account_code'])) 
+	elseif (!$accounts_alpha && !is_numeric($_POST['account_code'])) 
 	{
-		$input_error = 1;
-		display_error( _("The account code must be numeric."));
+	    $input_error = 1;
+	    display_error( _("The account code must be numeric."));
+		set_focus('account_code');
 	}
 
 	if ($input_error != 1)
 	{
+		if ($accounts_alpha == 2)
+			$_POST['account_code'] = strtoupper($_POST['account_code']);
     	if ($selected_account)
     		update_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']);    		
     	else
@@ -69,7 +74,7 @@ function can_delete($selected_account)
 {
 	if ($selected_account == "")
 		return false;
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account=$selected_account";
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account='$selected_account'";
 	$result = db_query($sql,"Couldn't test for existing transactions");
 
 	$myrow = db_fetch_row($result);
@@ -79,23 +84,23 @@ function can_delete($selected_account)
 		return false;
 	}
 
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act=$selected_account 
-		OR pyt_discount_act=$selected_account 
-		OR creditors_act=$selected_account 
-		OR grn_act=$selected_account 
-		OR exchange_diff_act=$selected_account 
-		OR purch_exchange_diff_act=$selected_account 
-		OR retained_earnings_act=$selected_account
-		OR freight_act=$selected_account
-		OR default_sales_act=$selected_account 
-		OR default_sales_discount_act=$selected_account
-		OR default_prompt_payment_act=$selected_account
-		OR default_inventory_act=$selected_account
-		OR default_cogs_act=$selected_account
-		OR default_adj_act=$selected_account
-		OR default_inv_sales_act=$selected_account
-		OR default_assembly_act=$selected_account
-		OR payroll_act=$selected_account";
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act='$selected_account' 
+		OR pyt_discount_act='$selected_account' 
+		OR creditors_act='$selected_account' 
+		OR grn_act='$selected_account' 
+		OR exchange_diff_act='$selected_account' 
+		OR purch_exchange_diff_act='$selected_account' 
+		OR retained_earnings_act='$selected_account'
+		OR freight_act='$selected_account'
+		OR default_sales_act='$selected_account' 
+		OR default_sales_discount_act='$selected_account'
+		OR default_prompt_payment_act='$selected_account'
+		OR default_inventory_act='$selected_account'
+		OR default_cogs_act='$selected_account'
+		OR default_adj_act='$selected_account'
+		OR default_inv_sales_act='$selected_account'
+		OR default_assembly_act='$selected_account'
+		OR payroll_act='$selected_account'";
 	$result = db_query($sql,"Couldn't test for default company GL codes");
 
 	$myrow = db_fetch_row($result);
@@ -105,7 +110,7 @@ function can_delete($selected_account)
 		return false;
 	}
 	
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE account_code=$selected_account";
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE account_code='$selected_account'";
 	$result = db_query($sql,"Couldn't test for bank accounts");
 
 	$myrow = db_fetch_row($result);
@@ -116,10 +121,10 @@ function can_delete($selected_account)
 	}	
 
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE 
-		inventory_account=$selected_account 
-		OR cogs_account=$selected_account
-		OR adjustment_account=$selected_account 
-		OR sales_account=$selected_account";
+		inventory_account='$selected_account' 
+		OR cogs_account='$selected_account'
+		OR adjustment_account='$selected_account' 
+		OR sales_account='$selected_account'";
 	$result = db_query($sql,"Couldn't test for existing stock GL codes");
 
 	$myrow = db_fetch_row($result);
@@ -129,7 +134,7 @@ function can_delete($selected_account)
 		return false;
 	}	
 	
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_types WHERE sales_gl_code=$selected_account OR purchasing_gl_code=$selected_account";
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_types WHERE sales_gl_code='$selected_account' OR purchasing_gl_code='$selected_account'";
 	$result = db_query($sql,"Couldn't test for existing tax GL codes");
 
 	$myrow = db_fetch_row($result);
@@ -140,10 +145,10 @@ function can_delete($selected_account)
 	}	
 	
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE 
-		sales_account=$selected_account 
-		OR sales_discount_account=$selected_account
-		OR receivables_account=$selected_account
-		OR payment_discount_account=$selected_account";
+		sales_account='$selected_account' 
+		OR sales_discount_account='$selected_account'
+		OR receivables_account='$selected_account'
+		OR payment_discount_account='$selected_account'";
 	$result = db_query($sql,"Couldn't test for existing cust branch GL codes");
 
 	$myrow = db_fetch_row($result);
@@ -154,9 +159,9 @@ function can_delete($selected_account)
 	}		
 	
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE 
-		purchase_account=$selected_account 
-		OR payment_discount_account=$selected_account 
-		OR payable_account=$selected_account";
+		purchase_account='$selected_account' 
+		OR payment_discount_account='$selected_account' 
+		OR payable_account='$selected_account'";
 	$result = db_query($sql,"Couldn't test for existing suppliers GL codes");
 
 	$myrow = db_fetch_row($result);
@@ -227,7 +232,7 @@ text_row_ex(_("Account Name:"), 'account_name', 60);
 
 gl_account_types_list_row(_("Account Group:"), 'account_type', null);
 
-tax_types_list_row(_("Tax Type:"), 'tax_code', null, true, _('No Tax'));
+tax_types_list_row(_("Tax Type:"), 'tax_code', null, _('No Tax'));
 
 end_table(1);