[0000197] Bug in closing some special balance sheet levels.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f898347d3fc550395d73c4c3700a5980089512b6..eade5e0043e0fb31c5c813ee0bc2919b0728bd4d 100644 (file)
--- 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 488f63347cbd3d2f25f5225d262df9304fb535de..370dfda6e1b3d1183b537b061c9d224800c1ddd5 100644 (file)
--- 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 ad10656cdc0f5f142359a2c5ad67a539e76fba34..607b446c1da5ddc916cc8cbaece65e3e10655c70 100644 (file)
--- 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 1ef4a9d72bc7877f3eb8783fd3baec3f1aa6abcc..58d605992164e6dd5e9faf0bbf4196fcfb6ee09e 100644 (file)
--- 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 15690a09a23ac1e0e840d42b2e9a37f9a937d480..0516c17ec53e8e6250a7f438052bad2cb0950414 100644 (file)
--- 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);