X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fbalance_sheet.php;h=e2cd107536108864a5b4e74d0b9724d2eb9545d5;hb=2aea99756a8c19766f0f9dfee56b27f7c1994f37;hp=eafb4855c020dab506f1d5d45bb82b9b41faef1d;hpb=884c36eec7dbaae89e1f5532cc2c2f8033b010fd;p=fa-stable.git

diff --git a/gl/inquiry/balance_sheet.php b/gl/inquiry/balance_sheet.php
index eafb4855..e2cd1075 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;
@@ -57,28 +57,27 @@ function display_type ($type, $typename, $from, $to, $convert, $dimension, $dime
 	//Get Accounts directly under this group/type
 	$result = get_gl_accounts(null, null, $type);	
 		
-	while ($account=db_fetch($result))
-	{
-		$prev_balance = get_gl_balance_from_to("", $from, $account["account_code"], $dimension, $dimension2);
-		$curr_balance = get_gl_trans_from_to($from, $to, $account["account_code"], $dimension, $dimension2);
-		if (!$prev_balance && !$curr_balance)
-			continue;
-		
-		if ($drilldown && $levelptr == 0)
-		{
-			$url = "<a href='$path_to_root/gl/inquiry/gl_account_inquiry.php?TransFromDate=" 
-				. $from . "&TransToDate=" . $to . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2 
-				. "&account=" . $account['account_code'] . "'>" . $account['account_code'] 
-				." ". $account['account_name'] ."</a>";				
-				
-			start_row("class='stockmankobg'");
-			label_cell($url);
-			amount_cell(($curr_balance + $prev_balance) * $convert);
-			end_row();
-		}
-		
-		$acctstotal += $curr_balance + $prev_balance;
-	}
+ 	while ($account=db_fetch($result))
+    {
+        $net_balance = get_gl_trans_from_to("", $to, $account["account_code"], $dimension, $dimension2);
+        if (!$net_balance)
+            continue;
+        
+        if ($drilldown && $levelptr == 0)
+        {
+            $url = "<a href='$path_to_root/gl/inquiry/gl_account_inquiry.php?TransFromDate=" 
+                . $from . "&TransToDate=" . $to . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2 
+                . "&account=" . $account['account_code'] . "'>" . $account['account_code'] 
+                ." ". $account['account_name'] ."</a>";                
+                
+            start_row("class='stockmankobg'");
+            label_cell($url);
+            amount_cell(($net_balance) * $convert);
+            end_row();
+        }
+        
+        $acctstotal += $net_balance;
+    }	
 	
 	$levelptr = 1;
 
@@ -87,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  
@@ -105,11 +104,10 @@ 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 
-				. "&AccGrp=" . $type ."'>" . $typename ."</a>";
+				. "&AccGrp=" . $type ."'>" . $type . " " . $typename ."</a>";
 				
 			alt_table_row_color($k);
 			label_cell($url);
@@ -157,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
 	{		
@@ -165,34 +163,32 @@ 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 )
 				{
 					$url = "<a href='$path_to_root/gl/inquiry/balance_sheet.php?TransFromDate=" 
 						. $from . "&TransToDate=" . $to . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2 
-						. "&AccGrp=" . $accounttype['id'] ."'>" . $accounttype['name'] ."</a>";	
+						. "&AccGrp=" . $accounttype['id'] ."'>" . $accounttype['id']." ".$accounttype['name'] ."</a>";	
 					alt_table_row_color($k);
 					label_cell($url);
 					amount_cell($TypeTotal * $convert);
@@ -250,10 +246,10 @@ function display_balance_sheet()
 		$convert = get_class_type_convert($class["ctype"]); 
 		
 		//Print Class Name	
-		table_section_title(get_account_type_name($_POST["AccGrp"]));	
+		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
@@ -272,5 +268,3 @@ end_form();
 
 end_page();
 
-?>
-