Implemented journal entries with multiply virtual AR/AP subaccounts.

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

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index d515b179b8825c7d7f1ae9478d38a7092ac67312..5cc96652d562c1d4ce3f4e043040b996d367ca83 100644 (file)
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -41,6 +41,7 @@ page($_SESSION['page_title'], false, false,'', $js);
 function line_start_focus() {
   global       $Ajax;
 
+  unset($_POST['Index']);
   $Ajax->activate('items_table');
   set_focus('_code_id_edit');
 }
@@ -97,6 +98,7 @@ function create_cart($type=0, $trans_no=0)
                unset ($_SESSION['journal_items']);
        }
 
+       check_is_closed($type, $trans_no);
        $cart = new items_cart($type);
     $cart->order_id = $trans_no;
 
@@ -108,7 +110,7 @@ function create_cart($type=0, $trans_no=0)
                                if ($row['amount'] == 0) continue;
                                $date = $row['tran_date'];
                                $cart->add_gl_item($row['account'], $row['dimension_id'], 
-                                       $row['dimension2_id'], $row['amount'], $row['memo_']);
+                                       $row['dimension2_id'], $row['amount'], $row['memo_'], '', $row['person_id']);
                        }
                }
                $cart->memo_ = get_comments_string($type, $trans_no);
@@ -118,10 +120,10 @@ function create_cart($type=0, $trans_no=0)
        } else {
                $cart->reference = $Refs->get_next(0);
                $cart->tran_date = new_doc_date();
+               if (!is_date_in_fiscalyear($cart->tran_date))
+                       $cart->tran_date = end_fiscalyear();
                $_POST['ref_original'] = -1;
        }
-       if (!is_date_in_fiscalyear($cart->tran_date))
-               $cart->tran_date = end_fiscalyear();
 
        $_POST['memo_'] = $cart->memo_;
        $_POST['ref'] = $cart->reference;
@@ -157,7 +159,7 @@ if (isset($_POST['Process']))
        } 
        elseif (!is_date_in_fiscalyear($_POST['date_'])) 
        {
-               display_error(_("The entered date is not in fiscal year."));
+               display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
                set_focus('date_');
                $input_error = 1;
        } 
@@ -265,7 +267,7 @@ function handle_update_item()
                $amount = -input_num('AmountCredit');
 
        $_SESSION['journal_items']->update_gl_item($_POST['Index'], $_POST['code_id'], 
-           $_POST['dimension_id'], $_POST['dimension2_id'], $amount, $_POST['LineMemo']);
+           $_POST['dimension_id'], $_POST['dimension2_id'], $amount, $_POST['LineMemo'], '', get_post('person_id'));
     }
        line_start_focus();
 }
@@ -291,7 +293,7 @@ function handle_new_item()
                $amount = -input_num('AmountCredit');
        
        $_SESSION['journal_items']->add_gl_item($_POST['code_id'], $_POST['dimension_id'],
-               $_POST['dimension2_id'], $amount, $_POST['LineMemo']);
+               $_POST['dimension2_id'], $amount, $_POST['LineMemo'], '', get_post('person_id'));
        line_start_focus();
 }
 
@@ -311,7 +313,7 @@ if (isset($_POST['CancelItemChanges']))
 
 if (isset($_POST['go']))
 {
-       display_quick_entries($_SESSION['journal_items'], $_POST['person_id'], input_num('totamount'), QE_JOURNAL);
+       display_quick_entries($_SESSION['journal_items'], $_POST['quick'], input_num('totamount'), QE_JOURNAL);
        $_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
        line_start_focus();
 }      
@@ -321,7 +323,7 @@ start_form();
 
 display_order_header($_SESSION['journal_items']);
 
-start_table("$table_style2 width=90%", 10);
+start_table(TABLESTYLE2, "width=90%", 10);
 start_row();
 echo "<td>";
 display_gl_items(_("Rows"), $_SESSION['journal_items']);