X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fbalance_sheet.php;h=6479ff83380ac228617143d780fa4002d639ffc3;hb=0a6988eadb9d779a9c49c79772c1c2a3e19b6b05;hp=01dc3c1e328c1c9db42636bfb9352b2131a15b18;hpb=78fe8cb8f56510ba3f6a1720b207a33b5828e071;p=fa-stable.git

diff --git a/gl/inquiry/balance_sheet.php b/gl/inquiry/balance_sheet.php
index 01dc3c1e..6479ff83 100644
--- a/gl/inquiry/balance_sheet.php
+++ b/gl/inquiry/balance_sheet.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 $js = "";
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js = get_js_date_picker();
 
 page(_($help_context = "Balance Sheet Drilldown"), false, false, "", $js);
@@ -47,9 +47,9 @@ if (isset($_GET["AccGrp"]))
 
 //----------------------------------------------------------------------------------------------------
 
-function display_type ($type, $typename, $from, $to, $convert, $dimension, $dimension2, $drilldown, $path_to_root)
+function display_type ($type, $typename, $from, $to, $convert, $dimension, $dimension2, $drilldown)
 {
-	global $levelptr, $k;
+	global $path_to_root, $levelptr, $k;
 	
 	$acctstotal = 0;
 	$typestotal = 0;
@@ -86,7 +86,7 @@ function display_type ($type, $typename, $from, $to, $convert, $dimension, $dime
 	while ($accounttype=db_fetch($result))
 	{			
 		$typestotal += display_type($accounttype["id"], $accounttype["name"], $from, $to, 
-			$convert, $dimension, $dimension2, $drilldown, $path_to_root);	
+			$convert, $dimension, $dimension2, $drilldown);
 	}
 
 	//Display Type Summary if total is != 0  
@@ -104,7 +104,6 @@ function display_type ($type, $typename, $from, $to, $convert, $dimension, $dime
 		$parent1 = $acctype1["parent"];
 		if ($drilldown && $parent1 == $_POST["AccGrp"])
 		//END Patch#2		
-		//elseif ($drilldown && $type != $_POST["AccGrp"])
 		{
 			$url = "<a href='$path_to_root/gl/inquiry/balance_sheet.php?TransFromDate=" 
 				. $from . "&TransToDate=" . $to . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2 
@@ -139,9 +138,9 @@ function display_balance_sheet()
 {
 	global $path_to_root;
 	
-	$from = begin_fiscalyear();
 	$to = $_POST['TransToDate'];
-	
+	$from = get_fiscalyear_begin_for_date($to);
+
 	if (!isset($_POST['Dimension']))
 		$_POST['Dimension'] = 0;
 	if (!isset($_POST['Dimension2']))
@@ -156,7 +155,7 @@ function display_balance_sheet()
 
 	div_start('balance_tbl');
 	
-	start_table(TABLESTYLE, "width=30%");			
+	start_table(TABLESTYLE, "width='30%'");
 		
 	if (!$drilldown) //Root Level
 	{		
@@ -164,28 +163,26 @@ function display_balance_sheet()
 		$lclose = 0.0; 
 		$calculateclose = 0.0;		
 
-		$parent = -1;
-
 		//Get classes for BS
 		$classresult = get_account_classes(false, 1);
 	
 		while ($class = db_fetch($classresult))
 		{	
 			$classclose = 0.0;
-			$convert = get_class_type_convert($class["ctype"]); 		
+			$convert = get_class_type_convert($class["ctype"]);
 			$ctype = $class["ctype"];
-			$classname = $class["class_name"];	
 
 			//Print Class Name	
 			table_section_title($class["class_name"]);
 			
 			//Get Account groups/types under this group/type
 			$typeresult = get_account_types(false, $class['cid'], -1);
-				
+			
+			$k = 0;
 			while ($accounttype=db_fetch($typeresult))
 			{
 				$TypeTotal = display_type($accounttype["id"], $accounttype["name"], $from, $to, 
-						$convert, $dimension, $dimension2, $drilldown, $path_to_root);	
+						$convert, $dimension, $dimension2, $drilldown);	
 				//Print Summary 
 				if ($TypeTotal != 0 )
 				{
@@ -252,10 +249,11 @@ function display_balance_sheet()
 		table_section_title($_POST["AccGrp"]. " " . get_account_type_name($_POST["AccGrp"]));	
 		
 		$classclose = display_type($accounttype["id"], $accounttype["name"], $from, $to, 
-			$convert, $dimension, $dimension2, $drilldown, $path_to_root);
+			$convert, $dimension, $dimension2, $drilldown);
 	}
 	
-	end_table(1); // outer table
+	end_table(); // outer table
+	hyperlink_params($_SERVER['PHP_SELF'], _("Back"), "TransFromDate=". $from . "&TransToDate=" . $to . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2);
 	div_end();
 }
 
@@ -269,7 +267,5 @@ display_balance_sheet();
 
 end_form();
 
-end_page();
-
-?>
+end_page(false, true);