Save/retrieve last document date.

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

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index 58832bdd1f9abf8c677cbccd8c27d017aa5af2f7..5a77bb84e7a433e5defe8e1cf8a125deeb388c92 100644 (file)
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 3;
 $path_to_root="..";
@@ -66,7 +66,7 @@ function handle_new_order()
 
     $_SESSION['journal_items'] = new items_cart(systypes::journal_entry());
 
-       $_POST['date_'] = Today();
+       $_POST['date_'] = new_doc_date();
        if (!is_date_in_fiscalyear($_POST['date_']))
                $_POST['date_'] = end_fiscalyear();
        $_SESSION['journal_items']->tran_date = $_POST['date_'];        
@@ -128,6 +128,7 @@ if (isset($_POST['Process']))
                $_POST['date_'], $_POST['ref'], check_value('Reverse'), $_POST['memo_']);
 
        $_SESSION['journal_items']->clear_items();
+       new_doc_date($_POST['date_']);
        unset($_SESSION['journal_items']);
 
        meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
@@ -223,62 +224,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 +239,11 @@ if (isset($_POST['CancelItemChanges']))
        line_start_focus();
 
 if (isset($_POST['go']))
-       display_quick_entries($_SESSION['journal_items'], $_POST['person_id'], input_num('totamount'));
+{
+       display_quick_entries($_SESSION['journal_items'], $_POST['person_id'], input_num('totamount'), QE_JOURNAL);
+       $_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
+       line_start_focus();
+}      
 //-----------------------------------------------------------------------------------------------
 
 if (isset($_GET['NewJournal']) || !isset($_SESSION['journal_items']))
@@ -318,7 +267,7 @@ end_row();
 end_table(1);
 
 submit_center('Process', _("Process Journal Entry"), true , 
-       _('Process journal entry only if debits equal to credits'), true);
+       _('Process journal entry only if debits equal to credits'), 'default');
 
 end_form();
 //------------------------------------------------------------------------------------------------