Form submit/escape hotkeys added.

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

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 0378e190de5352df51a9359ac21237b366951a0d..b9ce988214dfc566395cdd5ae53d12e6f7c15a74 100644 (file)
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.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>.
+***********************************************************************/
 $page_security = 3;
 $path_to_root="..";
 include_once($path_to_root . "/includes/ui/items_cart.inc");
@@ -105,7 +114,6 @@ function handle_new_order($type)
 {
        if (isset($_SESSION['pay_items']))
        {
-               $_SESSION['pay_items']->clear_items();
                unset ($_SESSION['pay_items']);
        }
 
@@ -245,70 +253,6 @@ function handle_new_item()
                $_POST['dimension2_id'], $amount, $_POST['LineMemo']);
        line_start_focus();
 }
-/*
-function display_quick_entries(&$cart)
-{
-       if (!check_num('totamount', 0))
-       {
-               display_error( _("The amount entered is not a valid number or is less than zero."));
-               set_focus('totamount');
-       }
-       elseif (!get_post('person_id'))
-       {
-               if ($cart->trans_type==systypes::bank_payment())        
-                       display_error( _("No Quick Entries are defined for Payment."));
-               else    
-                       display_error( _("No Quick Entries are defined for Deposit."));
-               set_focus('totamount');
-       }
-       else
-       {
-               $rate = 0;
-               $totamount = input_num('totamount');
-               $totamount = ($cart->trans_type==systypes::bank_payment() ? 1:-1) * $totamount;
-               $qe = get_quick_entry($_POST['person_id']);
-               $qe_lines = get_quick_entry_lines($_POST['person_id']);
-               while ($qe_line = db_fetch($qe_lines))
-               {
-                       if ($qe_line['tax_acc'])
-                       {
-                               $account = get_gl_account($qe_line['account']);
-                               $tax_group = $account['tax_code'];
-                               $items = get_tax_group_items($tax_group);
-                               while ($item = db_fetch($items))
-                                       $rate += $item['rate'];
-                               if ($rate != 0)
-                                       $totamount = $totamount * 100 / ($rate + 100);
-                               $cart->clear_items();
-
-                               $cart->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], 
-                                       $totamount, $qe['description']);
-                               $items = get_tax_group_items($tax_group);
-                               while ($item = db_fetch($items))
-                               {
-                                       if ($item['rate'] != 0)
-                                       {
-                                               $amount = $totamount * $item['rate'] / 100;
-                                               $code = ($cart->trans_type==systypes::bank_payment() ? $item['purchasing_gl_code'] : 
-                                                       $item['sales_gl_code']);
-                                               $cart->add_gl_item($code, 0, 0, $amount, $qe['description']);
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               if ($qe_line['pct'])
-                                       $amount = $totamount * $qe_line['amount'] / 100;
-                               else
-                                       $amount = $qe_line['amount'];
-                               $cart->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], 
-                                       $amount, $qe['description']);
-                       }               
-               }
-               line_start_focus();
-       }       
-}
-*/
 //-----------------------------------------------------------------------------------------------
 $id = find_submit('Delete');
 if ($id != -1)
@@ -326,12 +270,13 @@ if (isset($_POST['CancelItemChanges']))
 if (isset($_POST['go']))
 {
        display_quick_entries($_SESSION['pay_items'], $_POST['person_id'], input_num('totamount'), 
-               $_SESSION['pay_items']->trans_type==systypes::bank_payment());
+               $_SESSION['pay_items']->trans_type==systypes::bank_payment() ? QE_PAYMENT : QE_DEPOSIT);
+       $_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
        line_start_focus();
 }
 //-----------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 display_bank_header($_SESSION['pay_items']);
 
@@ -347,7 +292,7 @@ end_table(1);
 
 submit_center_first('Update', _("Update"), '', null);
 submit_center_last('Process', $_SESSION['pay_items']->trans_type==systypes::bank_payment() ?
-       _("Process Payment"):_("Process Deposit"), '', true);
+       _("Process Payment"):_("Process Deposit"), '', 'default');
 
 end_form();