EOL cleanup in rep602.php.

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

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 7ec52cc899a4bb103104c3dd5d6e68ef1added5e..1dbc3939c0ed714558ad897b7dc2649f33d6a6cb 100644 (file)
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -53,21 +53,32 @@ 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);
+       if (!isset($_POST['DatePaid'])) { // init page
+               $_POST['DatePaid'] = new_doc_date();
+               if (!is_date_in_fiscalyear($_POST['DatePaid']))
+                       $_POST['DatePaid'] = end_fiscalyear();
+       }
+    date_row(_("Transfer Date:"), 'DatePaid', '', true, 0, 0, 0, null, true);
+
+    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER));
+
+       table_section(2);
 
        $from_currency = get_bank_account_currency($_POST['FromBankAccount']);
        $to_currency = get_bank_account_currency($_POST['ToBankAccount']);
@@ -84,10 +95,6 @@ function gl_payment_controls()
                amount_row(_("Bank Charge:"), 'charge');
        }
 
-       table_section(2);
-
-    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER));
-
     textarea_row(_("Memo:"), 'memo_', null, 40,4);
 
        end_outer_table(1); // outer table
@@ -111,7 +118,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 +129,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 +159,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;
@@ -154,6 +184,12 @@ function check_valid_entries()
                set_focus('ToBankAccount');
                return false;
        }
+       
+       if (!db_has_currency_rates(get_bank_account_currency($_POST['FromBankAccount']), $_POST['DatePaid']))
+               return false;
+
+       if (!db_has_currency_rates(get_bank_account_currency($_POST['ToBankAccount']), $_POST['DatePaid']))
+               return false;
 
     return true;
 }
@@ -162,6 +198,7 @@ function check_valid_entries()
 
 function handle_add_deposit()
 {
+       new_doc_date($_POST['DatePaid']);
        $trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'],
                $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge'));