X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=f971fc569249772f9eced311c8d63ecd785dc6f6;hb=9437de4193bde74b4a77e6ddcafede09b500c241;hp=b7c7fcc5ef56ded16bb071e9b575b58cf4de588c;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index b7c7fcc5..f971fc56 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -34,7 +34,7 @@ check_db_has_bank_accounts(_("There are no bank accounts defined in the system."
 if (isset($_GET['AddedID'])) 
 {
 	$trans_no = $_GET['AddedID'];
-	$trans_type = systypes::bank_transfer();
+	$trans_type = ST_BANKTRANSFER;
 
    	display_notification_centered( _("Transfer has been entered"));
 
@@ -53,7 +53,8 @@ if (isset($_POST['_DatePaid_changed'])) {
 
 function gl_payment_controls()
 {
-	global $table_style2;
+	global $table_style2, $Refs;
+	
 	$home_currency = get_company_currency();
 
 	start_form();
@@ -85,7 +86,7 @@ function gl_payment_controls()
 
 	table_section(2);
 
-    ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_transfer()));
+    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER));
 
     textarea_row(_("Memo:"), 'memo_', null, 40,4);
 
@@ -100,6 +101,8 @@ function gl_payment_controls()
 
 function check_valid_entries()
 {
+	global $Refs;
+	
 	if (!is_date($_POST['DatePaid'])) 
 	{
 		display_error(_("The entered date is invalid."));
@@ -126,14 +129,19 @@ function check_valid_entries()
 		set_focus('charge');
 		return false;
 	}
-	if (!references::is_valid($_POST['ref'])) 
+	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."));
 		set_focus('ref');
 		return false;
 	}
 
-	if (!is_new_reference($_POST['ref'], systypes::bank_transfer())) 
+	if (!is_new_reference($_POST['ref'], ST_BANKTRANSFER)) 
 	{
 		display_error(_("The entered reference is already in use."));
 		set_focus('ref');