X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fbank_accounts.php;h=6795f55019f9238a0cf9163324a5db42931a27b7;hb=61fb69cf679671e44d7aaa10fab553c059e6f62e;hp=d8d02ab27b36d4188371618069f178183e4cb5dd;hpb=938f8bff59d5a8a31fb0ef71636abb6abb324365;p=fa-stable.git

diff --git a/gl/manage/bank_accounts.php b/gl/manage/bank_accounts.php
index d8d02ab2..6795f550 100644
--- a/gl/manage/bank_accounts.php
+++ b/gl/manage/bank_accounts.php
@@ -34,7 +34,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 		set_focus('bank_account_name');
 	} 
 	if ($Mode=='ADD_ITEM' && (gl_account_in_bank_accounts(get_post('account_code')) 
-			|| key_in_foreign_table(get_post('account_code'), 'gl_trans', 'account', true))) {
+			|| key_in_foreign_table(get_post('account_code'), 'gl_trans', 'account'))) {
 		$input_error = 1;
 		display_error(_("The GL account selected is already in use. Select another GL account."));
 		set_focus('account_code');
@@ -68,16 +68,15 @@ elseif( $Mode == 'Delete')
 	//the link to delete a selected record was clicked instead of the submit button
 
 	$cancel_delete = 0;
-	$acc = db_escape($selected_id);
 	// PREVENT DELETES IF DEPENDENT RECORDS IN 'bank_trans'
 
-	if (key_in_foreign_table($acc, 'bank_trans', 'bank_act', true))
+	if (key_in_foreign_table($selected_id, 'bank_trans', 'bank_act') || key_in_foreign_table(get_post('account_code'), 'gl_trans', 'account'))
 	{
 		$cancel_delete = 1;
 		display_error(_("Cannot delete this bank account because transactions have been created using this account."));
 	}
 
-	if (key_in_foreign_table($acc, 'sales_pos', 'pos_account', true))
+	if (key_in_foreign_table($selected_id, 'sales_pos', 'pos_account'))
 	{
 		$cancel_delete = 1;
 		display_error(_("Cannot delete this bank account because POS definitions have been created using this account."));
@@ -136,7 +135,7 @@ while ($myrow = db_fetch($result))
 inactive_control_row($th);
 end_table(1);
 
-$is_used = $selected_id != -1 && key_in_foreign_table($selected_id, 'bank_trans', 'bank_act', true);
+$is_used = $selected_id != -1 && key_in_foreign_table($selected_id, 'bank_trans', 'bank_act');
 
 start_table(TABLESTYLE2);
 
@@ -155,9 +154,6 @@ if ($selected_id != -1)
 	$_POST['dflt_curr_act'] = $myrow["dflt_curr_act"];
   }
 	hidden('selected_id', $selected_id);
-	hidden('account_code');
-	hidden('account_type');
-	hidden('BankAccountCurrency', $_POST['BankAccountCurrency']);	
 	set_focus('bank_account_name');
 } 
 
@@ -166,6 +162,7 @@ text_row(_("Bank Account Name:"), 'bank_account_name', null, 50, 100);
 if ($is_used) 
 {
 	label_row(_("Account Type:"), $bank_account_types[$_POST['account_type']]);
+	hidden('account_type');
 } 
 else 
 {
@@ -174,6 +171,7 @@ else
 if ($is_used) 
 {
 	label_row(_("Bank Account Currency:"), $_POST['BankAccountCurrency']);
+	hidden('BankAccountCurrency', $_POST['BankAccountCurrency']);
 } 
 else 
 {
@@ -183,8 +181,10 @@ else
 yesno_list_row(_("Default currency account:"), 'dflt_curr_act');
 
 if($is_used)
+{
 	label_row(_("Bank Account GL Code:"), $_POST['account_code']);
-else 
+	hidden('account_code');
+} else 
 	gl_all_accounts_list_row(_("Bank Account GL Code:"), 'account_code', null);
 
 text_row(_("Bank Name:"), 'bank_name', null, 50, 60);