Merged changes from main trunk up to 2.2.7

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

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index ee4f05932e310c42073e60d4ebfb8c946539d9b3..035de8ac0c22fe4990911eb3496ccd09aac087a0 100644 (file)
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -9,8 +9,8 @@
     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="..";
+$page_security = 'SA_JOURNALENTRY';
+$path_to_root = "..";
 include_once($path_to_root . "/includes/ui/items_cart.inc");
 
 include_once($path_to_root . "/includes/session.inc");
@@ -31,9 +31,9 @@ if ($use_date_picker)
 if (isset($_GET['ModifyGL'])) {
        $_SESSION['page_title'] = sprintf(_("Modifying Journal Transaction # %d."), 
                $_GET['trans_no']);
-       $help_page_title =_("Modifying Journal Transaction");
+       $help_context = "Modifying Journal Entry";
 } else
-       $_SESSION['page_title'] = _("Journal Entry");
+       $_SESSION['page_title'] = _($help_context = "Journal Entry");
 
 page($_SESSION['page_title'], false, false,'', $js);
 //--------------------------------------------------------------------------------------------------
@@ -49,19 +49,20 @@ function line_start_focus() {
 if (isset($_GET['AddedID'])) 
 {
        $trans_no = $_GET['AddedID'];
-       $trans_type = systypes::journal_entry();
+       $trans_type = ST_JOURNAL;
 
        display_notification_centered( _("Journal entry has been entered") . " #$trans_no");
 
     display_note(get_gl_view_str($trans_type, $trans_no, _("&View this Journal Entry")));
 
-       hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Journal Entry"));
+       reset_focus();
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter &New Journal Entry"), "NewJournal=Yes");
 
        display_footer_exit();
 } elseif (isset($_GET['UpdatedID'])) 
 {
        $trans_no = $_GET['UpdatedID'];
-       $trans_type = systypes::journal_entry();
+       $trans_type = ST_JOURNAL;
 
        display_notification_centered( _("Journal entry has been updated") . " #$trans_no");
 
@@ -89,6 +90,8 @@ elseif (isset($_GET['ModifyGL']))
 
 function create_cart($type=0, $trans_no=0)
 {
+       global $Refs;
+
        if (isset($_SESSION['journal_items']))
        {
                unset ($_SESSION['journal_items']);
@@ -110,16 +113,18 @@ function create_cart($type=0, $trans_no=0)
                }
                $cart->memo_ = get_comments_string($type, $trans_no);
                $cart->tran_date = sql2date($date);
-               $cart->reference = references::get($type, $trans_no);
+               $cart->reference = $Refs->get($type, $trans_no);
+               $_POST['ref_original'] = $cart->reference; // Store for comparison when updating
        } else {
-               $cart->reference = references::get_next(0);
+               $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;       
+       $_POST['ref'] = $cart->reference;
        $_POST['date_'] = $cart->tran_date;
 
        $_SESSION['journal_items'] = &$cart;
@@ -156,19 +161,20 @@ if (isset($_POST['Process']))
                set_focus('date_');
                $input_error = 1;
        } 
-       if ($_SESSION['journal_items']->order_id == 0) {
-               if (!references::is_valid($_POST['ref'])) 
-               {
-                       display_error( _("You must enter a reference."));
-                       set_focus('ref');
-                       $input_error = 1;
-               } 
-               elseif (references::exists(systypes::journal_entry(), $_POST['ref'])) 
-               {
-                       display_error( _("The entered reference is already in use."));
-                       set_focus('ref');
-                       $input_error = 1;
-               }
+       if (!$Refs->is_valid($_POST['ref'])) 
+       {
+               display_error( _("You must enter a reference."));
+               set_focus('ref');
+               $input_error = 1;
+       } 
+       elseif ($Refs->exists(ST_JOURNAL, $_POST['ref'])) 
+       {
+           // The reference can exist already so long as it's the same as the original (when modifying) 
+           if ($_POST['ref'] != $_POST['ref_original']) {
+               display_error( _("The entered reference is already in use."));
+               set_focus('ref');
+               $input_error = 1;
+           }
        }
        if ($input_error == 1)
                unset($_POST['Process']);
@@ -179,12 +185,11 @@ if (isset($_POST['Process']))
        $cart = &$_SESSION['journal_items'];
        $new = $cart->order_id == 0;
 
-       if ($new) 
-               $cart->reference = $_POST['ref'];
+       $cart->reference = $_POST['ref'];
        $cart->memo_ = $_POST['memo_'];
        $cart->tran_date = $_POST['date_'];
 
-       $trans_no = write_journal_entries($cart);
+       $trans_no = write_journal_entries($cart, check_value('Reverse'));
 
        $cart->clear_items();
        new_doc_date($_POST['date_']);
@@ -231,9 +236,14 @@ function check_item_data()
                set_focus('AmountCredit');
                return false;
        }
+       
+       if (!is_tax_gl_unique(get_post('code_id'))) {
+               display_error(_("Cannot post to GL account used by more than one tax type."));
+               set_focus('code_id');
+               return false;
+       }
 
-
-       if ($_SESSION["wa_current_user"]->access != 2 && is_bank_account($_POST['code_id'])) 
+       if (!$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL') && is_bank_account($_POST['code_id'])) 
        {
                display_error(_("You cannot make a journal entry for a bank account. Please use one of the banking functions for bank transactions."));
                set_focus('code_id');
@@ -254,8 +264,8 @@ function handle_update_item()
        else
                $amount = -input_num('AmountCredit');
 
-       $_SESSION['journal_items']->update_gl_item($_POST['Index'], $_POST['dimension_id'],
-               $_POST['dimension2_id'], $amount, $_POST['LineMemo']);
+       $_SESSION['journal_items']->update_gl_item($_POST['Index'], $_POST['code_id'], 
+           $_POST['dimension_id'], $_POST['dimension2_id'], $amount, $_POST['LineMemo']);
     }
        line_start_focus();
 }