X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_account_inquiry.php;h=3c415566d36937102ecfd4a73f02337dc634fd72;hb=76addbf42e148553411cf37bf1284d2cf6082b84;hp=668a61deefc533dc8f13f4f283f5dc445ee1cfb8;hpb=3626626c1d1497affa0e1b1f7da41c656e78a385;p=fa-stable.git

diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index 668a61de..3c415566 100644
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security = 8;
-$path_to_root="../..";
+/**********************************************************************
+    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 = 'SA_GLTRANSVIEW';
+$path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
 
@@ -56,7 +65,7 @@ function gl_inquiry_controls()
 
 	date_cells(_("from:"), 'TransFromDate', '', null, -30);
 	date_cells(_("to:"), 'TransToDate');
-	submit_cells('Show',_("Show"),'','', true);
+	submit_cells('Show',_("Show"),'','', 'default');
 
     end_row();
 
@@ -73,7 +82,7 @@ function gl_inquiry_controls()
 
 function show_results()
 {
-	global $path_to_root, $table_style;
+	global $path_to_root, $table_style, $systypes_array;
 
 	if (!isset($_POST["account"]) || $_POST["account"] == "")
 		return;
@@ -109,7 +118,7 @@ function show_results()
 	else
 	{
 		$begin = begin_fiscalyear();
-		if ($_POST['TransFromDate'] < $begin)
+		if (date1_greater_date2($begin, $_POST['TransFromDate']))
 			$begin = $_POST['TransFromDate'];
 		$begin = add_days($begin, -1);
 	}
@@ -120,6 +129,7 @@ function show_results()
 	label_cell("<b>"._("Opening Balance")." - ".$_POST['TransFromDate']."</b>", "colspan=$colspan");
 	display_debit_or_credit_cells($bfw);
 	label_cell("");
+	label_cell("");
 	end_row();
 	//$running_total =0;
 	$running_total = $bfw;
@@ -135,14 +145,14 @@ function show_results()
 
     	$trandate = sql2date($myrow["tran_date"]);
 
-    	label_cell(systypes::name($myrow["type"]));
+    	label_cell($systypes_array[$myrow["type"]]);
 		label_cell(get_gl_view_str($myrow["type"], $myrow["type_no"], $myrow["type_no"], true));
     	label_cell($trandate);
 		if ($dim >= 1)
 			label_cell(get_dimension_string($myrow['dimension_id'], true));
 		if ($dim > 1)
 			label_cell(get_dimension_string($myrow['dimension2_id'], true));
-		label_cell(payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"]));
+		label_cell(payment_person_name($myrow["person_type_id"],$myrow["person_id"]));
 		display_debit_or_credit_cells($myrow["amount"]);
 		amount_cell($running_total);
     	label_cell($myrow['memo_']);
@@ -161,6 +171,7 @@ function show_results()
 	label_cell("<b>" . _("Ending Balance") ." - ".$_POST['TransToDate']. "</b>", "colspan=$colspan");
 	display_debit_or_credit_cells($running_total);
 	label_cell("");
+	label_cell("");
 	end_row();
 
 	end_table(2);