X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=b28259e44b3fe90200a1e1d9ff51756c9810f089;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=ed8f5a089a9c50302c9e7614358e2e68b31fe496;hpb=2bbf52478cf6cbf4fb89395f18390f1a6af93f40;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index ed8f5a08..b28259e4 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -139,7 +139,7 @@ function check_inputs()
 	}
 
 	if (isset($_POST['charge']) && input_num('charge') > 0) {
-		$charge_acct = get_company_pref('bank_charge_act');
+		$charge_acct = get_bank_charge_account($_POST['bank_account']);
 		if (get_gl_account($charge_acct) == false) {
 			display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
 			set_focus('charge');
@@ -182,7 +182,7 @@ function check_inputs()
 	} 
 	elseif (!is_date_in_fiscalyear($_POST['DatePaid'])) 
 	{
-		display_error(_("The entered date is not in fiscal year."));
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 		set_focus('DatePaid');
 		return false;
 	}
@@ -273,12 +273,12 @@ start_form();
     supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
 
 	set_global_supplier($_POST['supplier_id']);
-	
+
 	if (!list_updated('bank_account'))
 		$_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']);		
-	
+
     bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
-	
+
 	bank_balance_row($_POST['bank_account']);
 
 	table_section(2);