Minor change (show all quotations)

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

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 6c7133de534f9e7c00340b7fc97f9456c386a4db..b7c7fcc5ef56ded16bb071e9b575b58cf4de588c 100644 (file)
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -1,7 +1,16 @@
 <?php
-
-$path_to_root="..";
-$page_security = 5;
+/**********************************************************************
+    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>.
+***********************************************************************/
+$page_security = 'SA_BANKTRANSFER';
+$path_to_root = "..";
 
 include_once($path_to_root . "/includes/session.inc");
 
@@ -19,7 +28,6 @@ if ($use_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."));
 
 //----------------------------------------------------------------------------------------
 
@@ -30,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()
@@ -44,47 +56,42 @@ 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
+       start_outer_table($table_style2, 5);
+
+       table_section(1);
 
-       echo "<table>";
        bank_accounts_list_row(_("From Account:"), 'FromBankAccount', null, true);
 
     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']);
        if ($from_currency != "" && $to_currency != "" && $from_currency != $to_currency) 
        {
                amount_row(_("Amount:"), 'amount', null, null, $from_currency);
+               amount_row(_("Bank Charge:"), 'charge', null, null, $from_currency);
 
                exchange_rate_display($from_currency, $to_currency, $_POST['DatePaid']);
        } 
        else 
        {
                amount_row(_("Amount:"), 'amount');
+               amount_row(_("Bank Charge:"), 'charge');
        }
 
-       echo "</table>";
-       echo "</td><td valign=top class='tableseparator'>"; // outer table
-       echo "<table>";
-
-       bank_trans_types_list_row(_("Transfer Type:"), 'TransferType', null);
+       table_section(2);
 
-    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);
 
-       end_table(1);
-
-       echo "</td></tr>";
-       end_table(1); // outer table
+       end_outer_table(1); // outer table
 
-    submit_center('AddPayment',_("Enter Transfer"));
+    submit_center('AddPayment',_("Enter Transfer"), true, '', 'default');
 
        end_form();
 }
@@ -113,6 +120,12 @@ function check_valid_entries()
                return false;
        }
 
+       if (isset($_POST['charge']) && !check_num('charge', 0)) 
+       {
+               display_error(_("The entered amount is invalid or less than zero."));
+               set_focus('charge');
+               return false;
+       }
        if (!references::is_valid($_POST['ref'])) 
        {
                display_error(_("You must enter a reference."));
@@ -141,11 +154,8 @@ function check_valid_entries()
 
 function handle_add_deposit()
 {
-       global $path_to_root;
-
        $trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'],
-               $_POST['DatePaid'], input_num('amount'),
-               $_POST['TransferType'], $_POST['ref'], $_POST['memo_']);
+               $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge'));
 
        meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
 }
@@ -154,7 +164,6 @@ function handle_add_deposit()
 
 function safeExit()
 {
-       global $path_to_root;
        echo "<br><br>";
        end_page();
        exit;