Much better presentation of new Balance Sheet, P&L Statement and Monthly Breakdown.

[fa-stable.git] / reporting / rep705.php

diff --git a/reporting/rep705.php b/reporting/rep705.php
index 341d6e5dd586ceb32b0e837b45de67152cffb8f4..610a82bd4675ff213a102cf3a2e45bbb87d8c37c 100644 (file)
--- a/reporting/rep705.php
+++ b/reporting/rep705.php
@@ -200,6 +200,7 @@ function print_annual_expense_breakdown()
 
        $closeclass = false;
        $convert = 1;
+       $ctype = 0;
 
        $accounts = get_gl_accounts_all(0);
 
@@ -230,7 +231,7 @@ function print_annual_expense_breakdown()
                        {
                                for ( ; $level >= 0, $typename[$level] != ''; $level--) 
                                {
-                                       if ($account['parent'] == $closing[$level] || $account['parent'] < $last)
+                                       if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
                                        {
                                                $rep->row += 6;
                                                $rep->Line($rep->row);
@@ -282,8 +283,9 @@ function print_annual_expense_breakdown()
                        $rep->Line($rep->row);
                        $rep->NewLine();
                }
-               $convert = get_account_class_convert($account['ClassID']);
                $classname = $account['AccountClassName'];
+               $ctype = $account['ClassType'];
+               $convert = (($ctype == CL_INCOME || $ctype == 0) ? -1 : 1); // backwards compatibility
 
                if ($account['account_code'] != null)
                {
@@ -325,7 +327,7 @@ function print_annual_expense_breakdown()
                {
                        for ( ; $level >= 0, $typename[$level] != ''; $level--) 
                        {
-                               if ($account['parent'] == $closing[$level] || $account['parent'] < $last)
+                               if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
                                {
                                        $rep->row += 6;
                                        $rep->Line($rep->row);