Fixed editable line layout.

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

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index fc07ffd76fa9018f29daadb2480291f5c92d4d34..77ba76b4ee1b4ba7761f90cf1264bf8772dd2fdf 100644 (file)
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.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");
@@ -37,9 +46,9 @@ if (isset($_GET['AddedID']))
 
        display_notification_centered( _("Journal entry has been entered") . " #$trans_no");
 
-    display_note(get_gl_view_str($trans_type, $trans_no, _("View this Journal Entry")));
+    display_note(get_gl_view_str($trans_type, $trans_no, _("&View this Journal Entry")));
 
-       hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter Another Journal Entry"));
+       hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Journal Entry"));
 
        display_footer_exit();
 }
@@ -82,7 +91,6 @@ if (isset($_POST['Process']))
                $input_error = 1;
        }
 
-
        if (!is_date($_POST['date_'])) 
        {
                display_error(_("The entered date is invalid."));
@@ -160,7 +168,12 @@ 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'])) 
        {
@@ -228,6 +241,12 @@ if (isset($_POST['UpdateItem']))
 if (isset($_POST['CancelItemChanges']))
        line_start_focus();
 
+if (isset($_POST['go']))
+{
+       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']))