From 976899b68d0b045cb0ad74915f49c3dbde2ea8e8 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sat, 14 May 2011 09:14:44 +0200
Subject: [PATCH 1/1] Fixed a minor bug in balance sheet drill down on screen.
 Chaitanya.

---
 gl/inquiry/balance_sheet.php | 43 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/gl/inquiry/balance_sheet.php b/gl/inquiry/balance_sheet.php
index 8bf52757..01dc3c1e 100644
--- a/gl/inquiry/balance_sheet.php
+++ b/gl/inquiry/balance_sheet.php
@@ -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;
 
-- 
2.30.2