After heavy testing a new set of nested subtypes in COA, Monthly Breakdown, Balance...

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

diff --git a/reporting/rep701.php b/reporting/rep701.php
index 6a44328efee127c786589cc51f49b31be3ea64ff..4f49b549fbf91c399fc69bc6ec93aff30487d2f9 100644 (file)
--- a/reporting/rep701.php
+++ b/reporting/rep701.php
@@ -60,34 +60,31 @@ function print_Chart_of_Accounts()
        $classname = '';
        $group = '';
 
-       $types = get_account_types_all();
+       $accounts = get_gl_accounts_all();
 
-       while ($type=db_fetch($types))
+       while ($account=db_fetch($accounts))
        {
-               if (!num_accounts_in_type($type['AccountType'], $type['parent']))
-                       continue;
-               if ($type['AccountTypeName'] != $group)
+               if ($account['AccountTypeName'] != $group)
                {
                        if ($classname != '')
                                $rep->row -= 4;
-                       if ($type['AccountClassName'] != $classname)
+                       if ($account['AccountClassName'] != $classname)
                        {
                                $rep->Font('bold');
-                               $rep->TextCol(0, 4, $type['AccountClassName']);
+                               $rep->TextCol(0, 4, $account['AccountClassName']);
                                $rep->Font();
                                //$rep->row -= ($rep->lineHeight + 4);
                                $rep->NewLine();
                        }
-                       $group = $type['AccountTypeName'];
-                       $rep->TextCol(0, 4, $type['AccountTypeName']);
+                       $group = $account['AccountTypeName'];
+                       $rep->TextCol(0, 4, $account['AccountTypeName']);
                        //$rep->Line($rep->row - 4);
                        //$rep->row -= ($rep->lineHeight + 4);
                        $rep->NewLine();
                }
-               $classname = $type['AccountClassName'];
+               $classname = $account['AccountClassName'];
                
-               $accounts = get_gl_accounts_in_type($type['AccountType']);
-               while ($account=db_fetch($accounts))
+               if ($account['account_code'] != null)
                {
                        if ($showbalance == 1)
                        {