X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_journal.php;h=5a77bb84e7a433e5defe8e1cf8a125deeb388c92;hb=47cdc160884d49ca90e9470a609cd42eac0a709e;hp=44b16f8558780e320270b29f226a460b14029d56;hpb=5e5d26fa99fece482cf4b9dcad9a1fc9e3142143;p=fa-stable.git

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index 44b16f85..5a77bb84 100644
--- 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");
@@ -239,7 +240,8 @@ if (isset($_POST['CancelItemChanges']))
 
 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();
 }	
 //-----------------------------------------------------------------------------------------------
@@ -265,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();
 //------------------------------------------------------------------------------------------------