X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=8b4bccec10bb9f893fe505f8d470e6aecba87bc0;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=f5d1f011a5e9a1ec4347023e295c3c45bf721738;hpb=cf8ea0adfea887c575f6833ef36403a9568585da;p=fa-stable.git

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index f5d1f011..8b4bccec 100644
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -142,7 +142,7 @@ function can_process()
 		set_focus('DateBanked');
 		return false;
 	} elseif (!is_date_in_fiscalyear($_POST['DateBanked'])) {
-		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('DateBanked');
 		return false;
 	}
@@ -179,7 +179,7 @@ function can_process()
 		return false;
 	}
 	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');
@@ -246,7 +246,7 @@ if (isset($_POST['ref']) && $_SESSION['alloc']->trans_no == 0) // added by Joe t
 		display_error( _("The entered reference is already in use."));
 		display_footer_exit();
 	}
-}		
+}
 $new = $_SESSION['alloc']->trans_no == 0;
 
 if (list_updated('customer_id') || ($new && list_updated('bank_account'))) {
@@ -376,7 +376,6 @@ start_form();
 	//Chaitanya : 13-OCT-2011 - Is AJAX call really needed ???
 	//bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true);
 	bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, false);
-
 	text_row(_("Reference:"), 'ref', null, 20, 40);
 
 	table_section(3);