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

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index fc07ffd7..fe4b56c2 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 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.
+    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>.
+***********************************************************************/
 $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();
 }
@@ -214,6 +223,61 @@ 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)
@@ -228,6 +292,8 @@ if (isset($_POST['UpdateItem']))
 if (isset($_POST['CancelItemChanges']))
 	line_start_focus();
 
+if (isset($_POST['go']))
+	display_quick_entries($_SESSION['journal_items']);
 //-----------------------------------------------------------------------------------------------
 
 if (isset($_GET['NewJournal']) || !isset($_SESSION['journal_items']))