From d992a9f19b9fcf8346dab90e1ac48a5aa86b6a21 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Mon, 1 Feb 2010 11:06:47 +0000
Subject: [PATCH] [0000197] Bug in closing some special balance sheet levels.

---
 CHANGELOG.txt                | 5 +++++
 gl/inquiry/balance_sheet.php | 4 ++--
 reporting/rep705.php         | 4 ++--
 reporting/rep706.php         | 4 ++--
 reporting/rep707.php         | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f898347..eade5e0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -22,6 +22,11 @@ $ -> Affected files
 01-Feb-2010 Joe Hunt
 # [0000198] But ignoring shipping cost in Direct Invoice (cash).
 $ /sales/sales_order_entry.php
+# [0000197] Bug in closing some special balance sheet levels.
+$ /gl/inquiry/balance_sheet.php
+  /reporting/rep705.php
+  /reporting/rep706.php
+  /reporting/rep707.php
 
 31-Jan-2010 Joe Hunt
 # Bug in Quick Entries with Tax added.
diff --git a/gl/inquiry/balance_sheet.php b/gl/inquiry/balance_sheet.php
index 488f633..370dfda 100644
--- a/gl/inquiry/balance_sheet.php
+++ b/gl/inquiry/balance_sheet.php
@@ -169,7 +169,7 @@ function print_balance_sheet()
 			{
 				for ( ; $level >= 0, $typename[$level] != ''; $level--) 
 				{
-					if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
+					if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0 || $closeclass)
 					{	
 					
 						$url = "<a href='$path_to_root/gl/inquiry/balance_sheet.php?TransFromDate=" 
@@ -278,7 +278,7 @@ function print_balance_sheet()
 		{
 			for ( ; $level >= 0, $typename[$level] != ''; $level--) 
 			{
-				if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
+				if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0 || $closeclass)
 				{
 					//Inside drill down, no hyperlink
 					if (isset($_POST['AccGrp']) && (strlen($_POST['AccGrp']) > 0) && ($acctype[$level] == $_POST['AccGrp']))
diff --git a/reporting/rep705.php b/reporting/rep705.php
index ad10656..607b446 100644
--- a/reporting/rep705.php
+++ b/reporting/rep705.php
@@ -236,7 +236,7 @@ function print_annual_expense_breakdown()
 			{
 				for ( ; $level >= 0, $typename[$level] != ''; $level--) 
 				{
-					if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
+					if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0 || $closeclass)
 					{
 						$rep->row += 6;
 						$rep->Line($rep->row);
@@ -332,7 +332,7 @@ function print_annual_expense_breakdown()
 		{
 			for ( ; $level >= 0, $typename[$level] != ''; $level--) 
 			{
-				if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
+				if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0 || $closeclass)
 				{
 					$rep->row += 6;
 					$rep->Line($rep->row);
diff --git a/reporting/rep706.php b/reporting/rep706.php
index 1ef4a9d..58d6059 100644
--- a/reporting/rep706.php
+++ b/reporting/rep706.php
@@ -164,7 +164,7 @@ function print_balance_sheet()
 			{
 				for ( ; $level >= 0, $typename[$level] != ''; $level--) 
 				{
-					if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
+					if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0 || $closeclass)
 					{
 						$rep->row += 6;
 						$rep->Line($rep->row);
@@ -281,7 +281,7 @@ function print_balance_sheet()
 		{
 			for ( ; $level >= 0, $typename[$level] != ''; $level--) 
 			{
-				if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
+				if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0 || $closeclass)
 				{
 					$rep->row += 6;
 					$rep->Line($rep->row);
diff --git a/reporting/rep707.php b/reporting/rep707.php
index 15690a0..0516c17 100644
--- a/reporting/rep707.php
+++ b/reporting/rep707.php
@@ -191,7 +191,7 @@ function print_profit_and_loss_statement()
 			{
 				for ( ; $level >= 0, $typename[$level] != ''; $level--) 
 				{
-					if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
+					if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0 || $closeclass)
 					{
 						$rep->row += 6;
 						$rep->Line($rep->row);
@@ -295,7 +295,7 @@ function print_profit_and_loss_statement()
 		{
 			for ( ; $level >= 0, $typename[$level] != ''; $level--) 
 			{
-				if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
+				if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0 || $closeclass)
 				{
 					$rep->row += 6;
 					$rep->Line($rep->row);
-- 
2.30.2