X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fgl_journal.php;h=5a77bb84e7a433e5defe8e1cf8a125deeb388c92;hb=e91772a2716825a6aeb358d1defba47d5f3892c1;hp=fc07ffd76fa9018f29daadb2480291f5c92d4d34;hpb=0414e70dba24e2186c3ed3ffbcee3c6cd296742c;p=fa-stable.git

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index fc07ffd7..5a77bb84 100644
--- 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();
 }
@@ -57,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_'];	
@@ -119,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");
@@ -228,6 +238,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']))
@@ -251,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();
 //------------------------------------------------------------------------------------------------