Default Receival Days implemented. Maintained in System and GL Setup.

[fa-stable.git] / gl / bank_transfer.php

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index f971fc569249772f9eced311c8d63ecd785dc6f6..7e293af1544fcb69624cd12bb9f2af817f8e58b9 100644 (file)
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -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."));
 
@@ -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,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)) 
        {
@@ -170,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();
        }
 }