X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_account_inquiry.php;h=1fed9b30a95a90427b70a3ecde1d1dcd43c8829f;hb=c8145b03ed9754bd9552ccdac38b41b73550a69f;hp=a86f0c2b6a518464381b9bd13f1723f5e5922d65;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index a86f0c2b..1fed9b30 100644
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -14,6 +14,7 @@ $path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
 
+include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
@@ -24,7 +25,7 @@ $js = '';
 set_focus('account');
 if ($use_popup_windows)
 	$js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 
 page(_($help_context = "General Ledger Inquiry"), false, false, '', $js);
@@ -61,28 +62,26 @@ if (!isset($_POST["amount_max"]))
 
 function gl_inquiry_controls()
 {
-	global $table_style2;
-
 	$dim = get_company_pref('use_dimension');
     start_form();
 
-    start_table("class='tablestyle_noborder'");
+    start_table(TABLESTYLE_NOBORDER);
 	start_row();
-    gl_all_accounts_list_cells(_("Account:"), 'account', null, false, false, "All Accounts");
-	date_cells(_("from:"), 'TransFromDate', '', null, -30);
+    gl_all_accounts_list_cells(_("Account:"), 'account', null, false, false, _("All Accounts"));
+	date_cells(_("from:"), 'TransFromDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
 	date_cells(_("to:"), 'TransToDate');
     end_row();
 	end_table();
 
-	start_table();
+	start_table(TABLESTYLE_NOBORDER);
 	start_row();
 	if ($dim >= 1)
 		dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1);
 	if ($dim > 1)
 		dimensions_list_cells(_("Dimension")." 2:", 'Dimension2', null, true, " ", false, 2);
 
-	small_amount_cells(_("Amount min:"), 'amount_min', null);
-	small_amount_cells(_("Amount max:"), 'amount_max', null);
+	small_amount_cells(_("Amount min:"), 'amount_min', null, " ");
+	small_amount_cells(_("Amount max:"), 'amount_max', null, " ");
 	submit_cells('Show',_("Show"),'','', 'default');
 	end_row();
 	end_table();
@@ -95,7 +94,7 @@ function gl_inquiry_controls()
 
 function show_results()
 {
-	global $path_to_root, $table_style, $systypes_array;
+	global $path_to_root, $systypes_array;
 
 	if (!isset($_POST["account"]))
 		$_POST["account"] = null;
@@ -122,7 +121,7 @@ function show_results()
                      input_num("amount_min") == 0 && 
                      input_num("amount_max") == 0;
 		
-	start_table($table_style);
+	start_table(TABLESTYLE);
 	
 	$first_cols = array(_("Type"), _("#"), _("Date"));
 	
@@ -150,7 +149,7 @@ function show_results()
 		$begin = "";
 	else
 	{
-		$begin = begin_fiscalyear();
+		$begin = get_fiscalyear_begin_for_date($_POST['TransFromDate']);
 		if (date1_greater_date2($begin, $_POST['TransFromDate']))
 			$begin = $_POST['TransFromDate'];
 		$begin = add_days($begin, -1);
@@ -161,7 +160,7 @@ function show_results()
 	    $bfw = get_gl_balance_from_to($begin, $_POST['TransFromDate'], $_POST["account"], $_POST['Dimension'], $_POST['Dimension2']);
     	start_row("class='inquirybg'");
     	label_cell("<b>"._("Opening Balance")." - ".$_POST['TransFromDate']."</b>", "colspan=$colspan");
-    	display_debit_or_credit_cells($bfw);
+    	display_debit_or_credit_cells($bfw, true);
     	label_cell("");
     	label_cell("");
     	end_row();
@@ -195,6 +194,8 @@ function show_results()
 		display_debit_or_credit_cells($myrow["amount"]);
 		if ($show_balances)
 		    amount_cell($running_total);
+		if ($myrow['memo_'] == "")
+			$myrow['memo_'] = get_comments_string($myrow['type'], $myrow['type_no']);
     	label_cell($myrow['memo_']);
     	end_row();
 
@@ -210,7 +211,7 @@ function show_results()
 	if ($show_balances) {
     	start_row("class='inquirybg'");
     	label_cell("<b>" . _("Ending Balance") ." - ".$_POST['TransToDate']. "</b>", "colspan=$colspan");
-    	display_debit_or_credit_cells($running_total);
+    	display_debit_or_credit_cells($running_total, true);
     	label_cell("");
     	label_cell("");
     	end_row();
@@ -228,7 +229,7 @@ gl_inquiry_controls();
 
 div_start('trans_tbl');
 
-if (get_post('Show'))
+if (get_post('Show') || get_post('account'))
     show_results();
 
 div_end();
@@ -237,4 +238,3 @@ div_end();
 
 end_page();
 
-?>