X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=7e293af1544fcb69624cd12bb9f2af817f8e58b9;hb=f1fe277df787cdefb65142d66ce247b8757ba057;hp=94748d2f0631daf471765a1d3edd563aec46dfcc;hpb=df0a865dbfdbdd5213fdce65e0f0aeb5feb19c69;p=fa-stable.git

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 94748d2f..7e293af1 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$path_to_root="..";
-$page_security = 5;
+$page_security = 'SA_BANKTRANSFER';
+$path_to_root = "..";
 
 include_once($path_to_root . "/includes/session.inc");
 
@@ -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."));
 
@@ -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"));
 
@@ -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,17 +53,20 @@ if (isset($_POST['_DatePaid_changed'])) {
 
 function gl_payment_controls()
 {
-	global $table_style2;
+	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);
@@ -85,7 +88,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 +103,8 @@ function gl_payment_controls()
 
 function check_valid_entries()
 {
+	global $Refs;
+	
 	if (!is_date($_POST['DatePaid'])) 
 	{
 		display_error(_("The entered date is invalid."));
@@ -108,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;
 	}
@@ -119,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)) 
 	{
@@ -126,14 +154,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');
@@ -162,21 +195,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();
 	}
 }