Security sql statements update against sql injection attacks.

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

diff --git a/reporting/rep706.php b/reporting/rep706.php
index a63f14bb69c9f30133be6bbcf1c298dc2aa85417..a1dece20730fe782b6a9cb74f0bb4ef547d7e0aa 100644 (file)
--- a/reporting/rep706.php
+++ b/reporting/rep706.php
@@ -112,17 +112,25 @@ function print_balance_sheet()
        $assetsopen = 0.0;
        $assetsperiod = 0.0;
        $assetsclose = 0.0;
+       $equityopen = 0.0;
+       $equityperiod = 0.0;
+       $equityclose = 0.0;
+       $lopen = 0.0;
+       $lperiod = 0.0;
+       $lclose = 0.0;
        
        $typeopen = array(0,0,0,0,0,0,0,0,0,0);
        $typeperiod = array(0,0,0,0,0,0,0,0,0,0);
        $typeclose = array(0,0,0,0,0,0,0,0,0,0);
        $typename = array('','','','','','','','','','');
        $closing = array(-1,-1,-1,-1,-1,-1,-1,-1,-1,-1);
-       $parent = array(-1,-1,-1,-1,-1,-1,-1,-1,-1,-1);
+       //$parent = array(-1,-1,-1,-1,-1,-1,-1,-1,-1,-1);
        $level = 0;
        $last = -1;
        
        $closeclass = false;
+       $ctype = 0;
+       $convert = 1;
        $rep->NewLine();
 
        $accounts = get_gl_accounts_all(1);
@@ -147,7 +155,6 @@ function print_balance_sheet()
                                $closeclass = true;
                        }
                }
-
                if ($account['AccountTypeName'] != $typename[$level])
                {
                        //$rep->NewLine();
@@ -157,18 +164,18 @@ function print_balance_sheet()
                        {
                                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);
                                                $rep->NewLine();
                                                $rep->TextCol(0, 2,     _('Total') . " " . $typename[$level]);
-                                               $rep->AmountCol(2, 3, $typeopen[$level], $dec);
-                                               $rep->AmountCol(3, 4, $typeperiod[$level], $dec);
-                                               $rep->AmountCol(4, 5, $typeclose[$level], $dec);
+                                               $rep->AmountCol(2, 3, $typeopen[$level] * $convert, $dec);
+                                               $rep->AmountCol(3, 4, $typeperiod[$level] * $convert, $dec);
+                                               $rep->AmountCol(4, 5, $typeclose[$level] * $convert, $dec);
                                                if ($graphics)
                                                {
-                                                       $pg->x[] = $$typename[$level];
+                                                       $pg->x[] = $typename[$level];
                                                        $pg->y[] = abs($typeclose[$level]);
                                                }
                                                $typeopen[$level] = $typeperiod[$level] = $typeclose[$level] = 0.0;
@@ -185,10 +192,22 @@ function print_balance_sheet()
                                        $rep->NewLine();
                                        $rep->Font('bold');
                                        $rep->TextCol(0, 2,     _('Total') . " " . $classname);
-                                       $rep->AmountCol(2, 3, $classopen, $dec);
-                                       $rep->AmountCol(3, 4, $classperiod, $dec);
-                                       $rep->AmountCol(4, 5, $classclose, $dec);
+                                       $rep->AmountCol(2, 3, $classopen * $convert, $dec);
+                                       $rep->AmountCol(3, 4, $classperiod * $convert, $dec);
+                                       $rep->AmountCol(4, 5, $classclose * $convert, $dec);
                                        $rep->Font();
+                                       if ($ctype == CL_EQUITY)
+                                       {
+                                               $equityopen += $classopen;
+                                               $equityperiod += $classperiod;
+                                               $equityclose += $classclose;
+                                       }
+                                       if ($ctype == CL_LIABILITIES)
+                                       {
+                                               $lopen += $classopen;
+                                               $lperiod += $classperiod;
+                                               $lclose += $classclose;
+                                       }
                                        $assetsopen += $classopen;
                                        $assetsperiod += $classperiod;
                                        $assetsclose += $classclose;
@@ -216,6 +235,8 @@ function print_balance_sheet()
                        $rep->NewLine();
                }
                $classname = $account['AccountClassName'];
+               $ctype = $account['ClassType'];
+               $convert = get_class_type_convert($ctype); 
 
                if ($account['account_code'] != null)
                {
@@ -231,9 +252,9 @@ function print_balance_sheet()
                        $rep->TextCol(0, 1,     $account['account_code']);
                        $rep->TextCol(1, 2,     $account['account_name']);
 
-                       $rep->AmountCol(2, 3, $prev_balance, $dec);
-                       $rep->AmountCol(3, 4, $curr_balance, $dec);
-                       $rep->AmountCol(4, 5, $curr_balance + $prev_balance, $dec);
+                       $rep->AmountCol(2, 3, $prev_balance * $convert, $dec);
+                       $rep->AmountCol(3, 4, $curr_balance * $convert, $dec);
+                       $rep->AmountCol(4, 5, ($curr_balance + $prev_balance) * $convert, $dec);
 
                        $rep->NewLine();
 
@@ -253,22 +274,25 @@ function print_balance_sheet()
        }
        if ($account['AccountTypeName'] != $typename[$level])
        {
+               //$rep->NewLine();
+               //$rep->TextCol(0, 5,   "type = ".$account['AccountType'].", level = $level, closing[0]-[1]-[2]-[3] = ".$closing[0]." ".$closing[1]." ".$closing[2]." ".$closing[3]." type[parent] = ".$account['parent']." last = ".$last);
+               //$rep->NewLine();
                if ($typename[$level] != '')
                {
                        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);
                                        $rep->NewLine();
                                        $rep->TextCol(0, 2,     _('Total') . " " . $typename[$level]);
-                                       $rep->AmountCol(2, 3, $typeopen[$level], $dec);
-                                       $rep->AmountCol(3, 4, $typeperiod[$level], $dec);
-                                       $rep->AmountCol(4, 5, $typeclose[$level], $dec);
+                                       $rep->AmountCol(2, 3, $typeopen[$level] * $convert, $dec);
+                                       $rep->AmountCol(3, 4, $typeperiod[$level] * $convert, $dec);
+                                       $rep->AmountCol(4, 5, $typeclose[$level] * $convert, $dec);
                                        if ($graphics)
                                        {
-                                               $pg->x[] = $$typename[$level];
+                                               $pg->x[] = $typename[$level];
                                                $pg->y[] = abs($typeclose[$level]);
                                        }
                                        $typeopen[$level] = $typeperiod[$level] = $typeclose[$level] = 0.0;
@@ -283,13 +307,19 @@ function print_balance_sheet()
                                $calculateopen = -$assetsopen - $classopen;
                                $calculateperiod = -$assetsperiod - $classperiod;
                                $calculateclose = -$assetsclose  - $classclose;
+                               if ($ctype == CL_EQUITY)
+                               {
+                                       $equityopen += $classopen;
+                                       $equityperiod += $classperiod;
+                                       $equityclose += $classclose;
+                               }
                                $rep->row += 6;
                                $rep->Line($rep->row);
                                $rep->NewLine();
                                $rep->TextCol(0, 2,     _('Calculated Return'));
-                               $rep->AmountCol(2, 3, $calculateopen, $dec);
-                               $rep->AmountCol(3, 4, $calculateperiod, $dec);
-                               $rep->AmountCol(4, 5, $calculateclose, $dec);
+                               $rep->AmountCol(2, 3, $calculateopen * $convert, $dec);
+                               $rep->AmountCol(3, 4, $calculateperiod * $convert, $dec);
+                               $rep->AmountCol(4, 5, $calculateclose * $convert, $dec);
                                if ($graphics)
                                {
                                        $pg->x[] = _('Calculated Return');
@@ -298,11 +328,23 @@ function print_balance_sheet()
                                $rep->NewLine(2);
                                $rep->Font('bold');
                                $rep->TextCol(0, 2,     _('Total') . " " . $classname);
-                               $rep->AmountCol(2, 3, -$assetsopen, $dec);
-                               $rep->AmountCol(3, 4, -$assetsperiod, $dec);
-                               $rep->AmountCol(4, 5, -$assetsclose, $dec);
+                               $rep->AmountCol(2, 3, -$assetsopen * $convert, $dec);
+                               $rep->AmountCol(3, 4, -$assetsperiod * $convert, $dec);
+                               $rep->AmountCol(4, 5, -$assetsclose * $convert, $dec);
                                $rep->Font();
                                $rep->NewLine();
+                               if ($equityopen != 0.0 || $equityperiod != 0.0 || $equityclose != 0.0 ||
+                                       $lopen != 0.0 || $lperiod != 0.0 || $lclose != 0.0)
+                               {
+                                       $rep->NewLine();
+                                       $rep->Font('bold');
+                                       $rep->TextCol(0, 2,     _('Total') . " " . _('Liabilities') . _(' and ') . _('Equities'));
+                                       $rep->AmountCol(2, 3, ($lopen + $equityopen + $calculateopen) * -1, $dec);
+                                       $rep->AmountCol(3, 4, ($lperiod + $equityperiod + $calculateperiod) * -1, $dec);
+                                       $rep->AmountCol(4, 5, ($lclose + $equityclose + $calculateclose) * -1, $dec);
+                                       $rep->Font();
+                                       $rep->NewLine();
+                               }
                        }
                }
        }