X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_journal.php;h=8d2853348a85e80cc339dbb635c7f78a77e15a83;hb=a5242af68e65661edb7175412444dce536a7f311;hp=fe4b56c2669dfed0cc54dd9e63f8b87da604b2ed;hpb=b17df731b4bb055c2fdd568bc4be9e5caa0ee07b;p=fa-stable.git

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index fe4b56c2..8d285334 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="..";
@@ -223,61 +223,6 @@ function handle_new_item()
 	line_start_focus();
 }
 
-function display_quick_entries(&$cart)
-{
-	if (!get_post('person_id'))
-	{
-		display_error( _("No Quick Entries are defined."));
-		set_focus('totamount');
-	}
-	else
-	{
-		$rate = 0;
-		$totamount = input_num('totamount');
-		//$totamount = ($cart->trans_type==systypes::bank_payment() ? 1:-1) * $totamount;
-		$qe = get_quick_entry($_POST['person_id']);
-		$qe_lines = get_quick_entry_lines($_POST['person_id']);
-		while ($qe_line = db_fetch($qe_lines))
-		{
-			if ($qe_line['tax_acc'])
-			{
-				$account = get_gl_account($qe_line['account']);
-				$tax_group = $account['tax_code'];
-				$items = get_tax_group_items($tax_group);
-				while ($item = db_fetch($items))
-					$rate += $item['rate'];
-				if ($rate != 0)
-					$totamount = $totamount * 100 / ($rate + 100);
-				$cart->clear_items();
-
-				$cart->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], 
-					$totamount, $qe['description']);
-				$items = get_tax_group_items($tax_group);
-				while ($item = db_fetch($items))
-				{
-					if ($item['rate'] != 0)
-					{
-						$amount = $totamount * $item['rate'] / 100;
-						$code = ($amount < 0 ? $item['purchasing_gl_code'] : 
-							$item['sales_gl_code']);
-						$cart->add_gl_item($code, 0, 0, $amount, $qe['description']);
-					}
-				}
-			}
-			else
-			{
-				if ($qe_line['pct'])
-					$amount = $totamount * $qe_line['amount'] / 100;
-				else
-					$amount = $qe_line['amount'];
-				$cart->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], 
-					$amount, $qe['description']);
-			}		
-		}
-		line_start_focus();
-	}	
-}
-
 //-----------------------------------------------------------------------------------------------
 $id = find_submit('Delete');
 if ($id != -1)
@@ -293,7 +238,11 @@ if (isset($_POST['CancelItemChanges']))
 	line_start_focus();
 
 if (isset($_POST['go']))
-	display_quick_entries($_SESSION['journal_items']);
+{
+	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']))