SID & start_form() cleanup.

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

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 83d2750afe2430b7414f9a3c85e69c034daae978..36e28a6a899b4d3ac7f137f7048d96cec394b492 100644 (file)
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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;
 
@@ -14,10 +23,11 @@ include_once($path_to_root . "/gl/includes/gl_ui.inc");
 $js = "";
 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);
 
 check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
-check_db_has_bank_trans_types(_("There are no bank transfer types defined in the system."));
 
 //----------------------------------------------------------------------------------------
 
@@ -28,13 +38,17 @@ if (isset($_GET['AddedID']))
 
        display_notification_centered( _("Transfer has been entered"));
 
-       display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Journal Entries for this Transfer")));
+       display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Journal Entries for this Transfer")));
 
-       hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter Another Transfer"));
+       hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Transfer"));
 
        safeExit();
 }
 
+if (isset($_POST['_DatePaid_changed'])) {
+       $Ajax->activate('_ex_rate');
+}
+
 //----------------------------------------------------------------------------------------
 
 function gl_payment_controls()
@@ -42,7 +56,7 @@ function gl_payment_controls()
        global $table_style2;
        $home_currency = get_company_currency();
 
-       start_form(false, true);
+       start_form();
 
        start_table($table_style2, 5, 7);
        echo "<tr><td valign=top>"; // outer table
@@ -52,7 +66,7 @@ function gl_payment_controls()
 
     bank_accounts_list_row(_("To Account:"), 'ToBankAccount', null, true);
 
-    date_row(_("Transfer Date:"), 'DatePaid');
+    date_row(_("Transfer Date:"), 'DatePaid', '', null, 0, 0, 0, null, true);
 
        $from_currency = get_bank_account_currency($_POST['FromBankAccount']);
        $to_currency = get_bank_account_currency($_POST['ToBankAccount']);
@@ -71,9 +85,7 @@ function gl_payment_controls()
        echo "</td><td valign=top class='tableseparator'>"; // outer table
        echo "<table>";
 
-       bank_trans_types_list_row(_("Transfer Type:"), 'TransferType', null);
-
-    ref_row(_("Reference:"), 'ref', references::get_next(systypes::bank_transfer()));
+    ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_transfer()));
 
     textarea_row(_("Memo:"), 'memo_', null, 40,4);
 
@@ -82,7 +94,7 @@ function gl_payment_controls()
        echo "</td></tr>";
        end_table(1); // outer table
 
-    submit_center('AddPayment',_("Enter Transfer"));
+    submit_center('AddPayment',_("Enter Transfer"), true, '', true);
 
        end_form();
 }
@@ -94,40 +106,41 @@ function check_valid_entries()
        if (!is_date($_POST['DatePaid'])) 
        {
                display_error(_("The entered date is invalid."));
+               set_focus('DatePaid');
                return false;
        }
        if (!is_date_in_fiscalyear($_POST['DatePaid']))
        {
                display_error(_("The entered date is not in fiscal year."));
+               set_focus('DatePaid');
                return false;
        }
 
-       if (!is_numeric($_POST['amount'])) 
+       if (!check_num('amount', 0)) 
        {
-               display_error(_("The entered amount is invalid."));
-               return false;
-       }
-       if ($_POST['amount'] <= 0) 
-       {
-               display_error(_("The entered amount must be a positive number."));
+               display_error(_("The entered amount is invalid or less than zero."));
+               set_focus('amount');
                return false;
        }
 
        if (!references::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())) 
        {
                display_error(_("The entered reference is already in use."));
+               set_focus('ref');
                return false;
        }
 
        if ($_POST['FromBankAccount'] == $_POST['ToBankAccount']) 
        {
                display_error(_("The source and destination bank accouts cannot be the same."));
+               set_focus('ToBankAccount');
                return false;
        }
 
@@ -138,11 +151,8 @@ function check_valid_entries()
 
 function handle_add_deposit()
 {
-       global $path_to_root;
-
        $trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'],
-               $_POST['DatePaid'], $_POST['amount'],
-               $_POST['TransferType'], $_POST['ref'], $_POST['memo_']);
+               $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_']);
 
        meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
 }
@@ -151,7 +161,6 @@ function handle_add_deposit()
 
 function safeExit()
 {
-       global $path_to_root;
        echo "<br><br>";
        end_page();
        exit;