X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_account_inquiry.php;h=6fedc61ede6d1fc3f251413a219060f7e477ebe5;hb=debb4ba801f7bac134d8a1925ad5bf5b9dc4a785;hp=94ef03bf91a706c5d643d97a7a0e94c219bcdfef;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index 94ef03bf..6fedc61e 100644
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -14,6 +14,8 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 $js = get_js_set_focus('account');
 if ($use_popup_windows)
 	$js .= get_js_open_window(800, 500);
+if ($use_date_picker)
+	$js .= get_js_date_picker();
 
 page(_("General Ledger Account Inquiry"), false, false, "setFocus()", $js);
 
@@ -35,20 +37,20 @@ if (isset($_GET["Dimension2"]))
 function gl_inquiry_controls()
 {
 	global $table_style2;
-	
+
 	$dim = get_company_pref('use_dimension');
     start_form();
 
     //start_table($table_style2);
     start_table("class='tablestyle_noborder'");
 	start_row();
-	
+
     gl_all_accounts_list_cells(_("Account:"), 'account', null);
 
 	date_cells(_("from:"), 'TransFromDate', null, -30);
 	date_cells(_("to:"), 'TransToDate');
     submit_cells('Show',_("Show"));
-    
+
     end_row();
 
 	if ($dim >= 1)
@@ -56,7 +58,7 @@ function gl_inquiry_controls()
 	if ($dim > 1)
 		dimensions_list_row(_("Dimension")." 2", 'Dimension2', null, true, " ", false, 2);
 	end_table();
-    
+
     end_form();
 }
 
@@ -79,11 +81,6 @@ function show_results()
 	$result = get_gl_transactions($_POST['TransFromDate'], $_POST['TransToDate'], -1,
     	$_POST["account"], $_POST['Dimension'], $_POST['Dimension2']);
 
-	if (db_num_rows($result) == 0)
-	{
-		display_note(_("No general ledger transactions have been created for this account on the selected dates."), 0, 1);
-		return;
-	}
 	$colspan = ($dim == 2 ? "6" : ($dim == 1 ? "5" : "4"));
 	//echo "\nDimension =". $_POST['Dimension'];
 	display_heading($_POST["account"]. "   ".$act_name);
@@ -95,11 +92,21 @@ function show_results()
 	else if ($dim == 1)
 		$th = array(_("Type"), _("#"), _("Date"), _("Dimension"),
 			_("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo"));
-	else		
-		$th = array(_("Type"), _("#"), _("Date"), 
+	else
+		$th = array(_("Type"), _("#"), _("Date"),
 			_("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo"));
 	table_header($th);
-    $bfw = get_gl_balance_from_to("", $_POST['TransFromDate'], $_POST["account"], $_POST['Dimension'], $_POST['Dimension2']);
+	if (is_account_balancesheet($_POST["account"]))
+		$begin = "";
+	else
+	{
+		$begin = begin_fiscalyear();
+		if ($_POST['TransFromDate'] < $begin)
+			$begin = $_POST['TransFromDate'];
+		$begin = add_days($begin, -1);
+	}
+
+    $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");
@@ -111,7 +118,7 @@ function show_results()
 	$j = 1;
 	$k = 0; //row colour counter
 
-	while ($myrow = db_fetch($result)) 
+	while ($myrow = db_fetch($result))
 	{
 
     	alt_table_row_color($k);
@@ -135,8 +142,8 @@ function show_results()
 
     	$j++;
     	if ($j == 12)
-    	{ 
-    		$j = 1; 
+    	{
+    		$j = 1;
     		table_header($th);
     	}
 	}
@@ -149,6 +156,8 @@ function show_results()
 	end_row();
 
 	end_table(2);
+	if (db_num_rows($result) == 0)
+		display_note(_("No general ledger transactions have been created for this account on the selected dates."), 0, 1);
 }
 
 //----------------------------------------------------------------------------------------------------