Minor fix

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 0378e190de5352df51a9359ac21237b366951a0d..c40def6c8f52f5a6cc3c23c19e3024f236ac9b5d 100644 (file)
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -245,70 +245,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)

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index 58832bdd1f9abf8c677cbccd8c27d017aa5af2f7..44b16f8558780e320270b29f226a460b14029d56 100644 (file)
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -223,62 +223,6 @@ function handle_new_item()
        line_start_focus();
 }
 
-/*
-function display_quick_entries(&$cart)
-{
-       if (!get_post('person_id'))
-       {
-               display_error( _("No Quick Entries are defined."));
-               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 = ($amount < 0 ? $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)
@@ -294,7 +238,10 @@ if (isset($_POST['CancelItemChanges']))
        line_start_focus();
 
 if (isset($_POST['go']))
+{
        display_quick_entries($_SESSION['journal_items'], $_POST['person_id'], input_num('totamount'));
+       line_start_focus();
+}      
 //-----------------------------------------------------------------------------------------------
 
 if (isset($_GET['NewJournal']) || !isset($_SESSION['journal_items']))