X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fbank_accounts.php;h=83d425f80093dc39f953b31ec3936f5757d243cd;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=c70fc9e9aa14059b2eb01496ce2ccecb1da118f1;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/gl/manage/bank_accounts.php b/gl/manage/bank_accounts.php
index c70fc9e9..83d425f8 100644
--- a/gl/manage/bank_accounts.php
+++ b/gl/manage/bank_accounts.php
@@ -42,7 +42,8 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
     		update_bank_account($selected_id, $_POST['account_code'],
 				$_POST['account_type'], $_POST['bank_account_name'], 
 				$_POST['bank_name'], $_POST['bank_account_number'], 
-    			$_POST['bank_address'], $_POST['BankAccountCurrency']);		
+    			$_POST['bank_address'], $_POST['BankAccountCurrency'],
+    			$_POST['dflt_curr_act']);
 			display_notification(_('Bank account has been updated'));
     	} 
     	else 
@@ -50,8 +51,8 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
     
     		add_bank_account($_POST['account_code'], $_POST['account_type'], 
 				$_POST['bank_account_name'], $_POST['bank_name'], 
-    			$_POST['bank_account_number'], 	$_POST['bank_address'], 
-				$_POST['BankAccountCurrency']);
+    			$_POST['bank_account_number'], $_POST['bank_address'], 
+				$_POST['BankAccountCurrency'], $_POST['dflt_curr_act']);
 			display_notification(_('New bank account has been added'));
     	}
  		$Mode = 'RESET';
@@ -62,10 +63,10 @@ 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'
 
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_trans WHERE bank_act='$selected_id'";
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_trans WHERE bank_act=$acc";
 	$result = db_query($sql,"check failed");
 	$myrow = db_fetch_row($result);
 	if ($myrow[0] > 0) 
@@ -73,7 +74,7 @@ elseif( $Mode == 'Delete')
 		$cancel_delete = 1;
 		display_error(_("Cannot delete this bank account because transactions have been created using this account."));
 	}
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."sales_pos WHERE pos_account='$selected_id'";
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."sales_pos WHERE pos_account=$acc";
 	$result = db_query($sql,"check failed");
 	$myrow = db_fetch_row($result);
 	if ($myrow[0] > 0) 
@@ -112,7 +113,7 @@ start_form();
 start_table("$table_style width='80%'");
 
 $th = array(_("Account Name"), _("Type"), _("Currency"), _("GL Account"), 
-	_("Bank"), _("Number"), _("Bank Address"),'','');
+	_("Bank"), _("Number"), _("Bank Address"), _("Dflt"), '','');
 inactive_control_column($th);
 table_header($th);	
 
@@ -129,6 +130,11 @@ while ($myrow = db_fetch($result))
     label_cell($myrow["bank_name"], "nowrap");
     label_cell($myrow["bank_account_number"], "nowrap");
     label_cell($myrow["bank_address"]);
+    if ($myrow["dflt_curr_act"])
+		label_cell(_("Yes"));
+	else
+		label_cell(_("No"));
+
 	inactive_control_cell($myrow["id"], $myrow["inactive"], 'bank_accounts', 'id');
  	edit_button_cell("Edit".$myrow["id"], _("Edit"));
  	delete_button_cell("Delete".$myrow["id"], _("Delete"));
@@ -154,6 +160,7 @@ if ($is_editing)
 	$_POST['bank_account_number'] = $myrow["bank_account_number"];
 	$_POST['bank_address'] = $myrow["bank_address"];
 	$_POST['BankAccountCurrency'] = $myrow["bank_curr_code"];
+	$_POST['dflt_curr_act'] = $myrow["dflt_curr_act"];
   }
 	hidden('selected_id', $selected_id);
 	hidden('account_code');
@@ -181,6 +188,8 @@ else
 	currencies_list_row(_("Bank Account Currency:"), 'BankAccountCurrency', null);
 }	
 
+yesno_list_row(_("Default currency account:"), 'dflt_curr_act');
+
 if($is_editing)
 	label_row(_("Bank Account GL Code:"), $_POST['account_code']);
 else