X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=5ed84c08e4528c12537c456bc4a9fa94d9ab17ec;hb=1d8ca637beb25da5f36084fdecb6c24dc5d61eab;hp=893fabea478d9f018b631c7ed34210fde343a929;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 893fabea..5ed84c08 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -25,7 +25,7 @@ if ($use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if ($use_date_picker)
 	$js .= get_js_date_picker();
-page(_("Transfer between Bank Accounts"), false, false, "", $js);
+page(_($help_context = "Transfer between Bank Accounts"), false, false, "", $js);
 
 check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
 
@@ -42,7 +42,7 @@ if (isset($_GET['AddedID']))
 
    	hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Transfer"));
 
-	safeExit();
+	display_footer_exit();
 }
 
 if (isset($_POST['_DatePaid_changed'])) {
@@ -53,13 +53,13 @@ if (isset($_POST['_DatePaid_changed'])) {
 
 function gl_payment_controls()
 {
-	global $table_style2, $Refs;
+	global $Refs;
 	
 	$home_currency = get_company_currency();
 
 	start_form();
 
-	start_outer_table($table_style2, 5);
+	start_outer_table(TABLESTYLE2);
 
 	table_section(1);
 
@@ -129,6 +129,11 @@ function check_valid_entries()
 		set_focus('charge');
 		return false;
 	}
+	if (isset($_POST['charge']) && input_num('charge') > 0 && get_company_pref('bank_charge_act') == '') {
+		display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
+		set_focus('charge');
+		return false;
+	}
 	if (!$Refs->is_valid($_POST['ref'])) 
 	{
 		display_error(_("You must enter a reference."));
@@ -165,21 +170,11 @@ function handle_add_deposit()
 
 //----------------------------------------------------------------------------------------
 
-function safeExit()
-{
-	echo "<br><br>";
-	end_page();
-	exit;
-}
-
-//----------------------------------------------------------------------------------------
-
 if (isset($_POST['AddPayment']))
 {
 	if (check_valid_entries() == true) 
 	{
 		handle_add_deposit();
-		safeExit();
 	}
 }