X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=d99402b4ae3fad9d6e0b0d63f882499bbcf55a19;hb=825a4b279d6af05322188299f6a3967d2562f1e9;hp=7ec52cc899a4bb103104c3dd5d6e68ef1added5e;hpb=0be6e08dfa9420e8a33a518d65107288845d42fe;p=fa-stable.git

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 7ec52cc8..d99402b4 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -53,18 +53,20 @@ 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);
 
 	bank_accounts_list_row(_("From Account:"), 'FromBankAccount', null, true);
 
+	bank_balance_row($_POST['FromBankAccount']);
+
     bank_accounts_list_row(_("To Account:"), 'ToBankAccount', null, true);
 
     date_row(_("Transfer Date:"), 'DatePaid', '', null, 0, 0, 0, null, true);
@@ -111,7 +113,7 @@ function check_valid_entries()
 	}
 	if (!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;
 	}
@@ -122,6 +124,29 @@ function check_valid_entries()
 		set_focus('amount');
 		return false;
 	}
+	if (input_num('amount') == 0) {
+		display_error(_("The total bank amount cannot be 0."));
+		set_focus('amount');
+		return false;
+	}
+
+	$limit = get_bank_account_limit($_POST['FromBankAccount'], $_POST['DatePaid']);
+
+	$amnt_tr = input_num('charge') + input_num('amount');
+
+	if ($limit != null && ($limit < $amnt_tr))
+	{
+		display_error(sprintf(_("The total bank amount exceeds allowed limit (%s) for source account."), price_format($limit)));
+		set_focus('amount');
+		return false;
+	}
+	if ($trans = check_bank_account_history(-$amnt_tr, $_POST['FromBankAccount'], $_POST['DatePaid'])) {
+
+		display_error(sprintf(_("The bank transaction would result in exceed of authorized overdraft limit for transaction: %s #%s on %s."),
+			$systypes_array[$trans['type']], $trans['trans_no'], sql2date($trans['trans_date'])));
+		set_focus('amount');
+		$input_error = 1;
+	}
 
 	if (isset($_POST['charge']) && !check_num('charge', 0)) 
 	{
@@ -129,7 +154,7 @@ function check_valid_entries()
 		set_focus('charge');
 		return false;
 	}
-	if (isset($_POST['charge']) && input_num('charge') > 0 && get_company_pref('bank_charge_act') == '') {
+	if (isset($_POST['charge']) && input_num('charge') > 0 && get_bank_charge_account($_POST['FromBankAccount']) == '') {
 		display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
 		set_focus('charge');
 		return false;