Fixed automatic price calculations always on.

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

diff --git a/reporting/rep708.php b/reporting/rep708.php
index 2c8ebb32084c0c9fd81a5f754eb1a72d425446d2..97d2d95d73d4b928ea55c4ffe4c6f2effaa44eaa 100644 (file)
--- a/reporting/rep708.php
+++ b/reporting/rep708.php
@@ -80,14 +80,16 @@ function print_trial_balance()
        }
        $dec = user_price_dec();
 
-       $cols2 = array(0, 50, 230, 330, 430, 530);
+       //$cols2 = array(0, 50, 230, 330, 430, 530);
+       $cols2 = array(0, 50, 190, 310, 430, 530);
        //-------------0--1---2----3----4----5--
 
        $headers2 = array('', '', _('Brought Forward'), _('This Period'), _('Balance'));
 
        $aligns2 = array('left', 'left', 'left', 'left', 'left');
 
-       $cols = array(0, 50, 200, 250, 300,     350, 400, 450, 500,     550);
+       //$cols = array(0, 50, 200, 250, 300,   350, 400, 450, 500,     550);
+       $cols = array(0, 50, 150, 210, 270,     330, 390, 450, 510,     570);
        //------------0--1---2----3----4----5----6----7----8----9--
 
        $headers = array(_('Account'), _('Account Name'), _('Debit'), _('Credit'), _('Debit'),
@@ -125,6 +127,7 @@ function print_trial_balance()
 
        $accounts = get_gl_accounts();
 
+       $pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
        $begin = begin_fiscalyear();
        if (date1_greater_date2($begin, $from))
                $begin = $from;
@@ -162,7 +165,17 @@ function print_trial_balance()
                        $rep->TextCol(5, 6,     number_format2($curr['credit'], $dec));
                        $rep->TextCol(6, 7,     number_format2($tot['debit'], $dec));
                        $rep->TextCol(7, 8,     number_format2($tot['credit'], $dec));
+                       $pdeb += $prev['debit'];
+                       $pcre += $prev['credit'];
+                       $cdeb += $curr['debit'];
+                       $ccre += $curr['credit'];
+                       $tdeb += $tot['debit'];
+                       $tcre += $tot['credit'];
+                       
                }       
+               $pbal += $prev['balance'];
+               $cbal += $curr['balance'];
+               $tbal += $tot['balance'];
                $rep->NewLine();
 
                if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
@@ -175,35 +188,35 @@ function print_trial_balance()
        $rep->NewLine();
        $rep->Font('bold');
 
-       $prev = get_balance(null, $dimension, $dimension2, $begin, $from, false, false);
-       $curr = get_balance(null, $dimension, $dimension2, $from, $to, true, true);
-       $tot = get_balance(null, $dimension, $dimension2, $begin, $to, false, true);
+       //$prev = get_balance(null, $dimension, $dimension2, $begin, $from, false, false);
+       //$curr = get_balance(null, $dimension, $dimension2, $from, $to, true, true);
+       //$tot = get_balance(null, $dimension, $dimension2, $begin, $to, false, true);
 
        if ($balances == 0)
        {
                $rep->TextCol(0, 2, _("Total"));
-               $rep->TextCol(2, 3,     number_format2($prev['debit'], $dec));
-               $rep->TextCol(3, 4,     number_format2($prev['credit'], $dec));
-               $rep->TextCol(4, 5,     number_format2($curr['debit'], $dec));
-               $rep->TextCol(5, 6,     number_format2($curr['credit'], $dec));
-               $rep->TextCol(6, 7,     number_format2($tot['debit'], $dec));
-               $rep->TextCol(7, 8,     number_format2($tot['credit'], $dec));
+               $rep->TextCol(2, 3,     number_format2($pdeb, $dec));
+               $rep->TextCol(3, 4,     number_format2($pcre, $dec));
+               $rep->TextCol(4, 5,     number_format2($cdeb, $dec));
+               $rep->TextCol(5, 6,     number_format2($ccre, $dec));
+               $rep->TextCol(6, 7,     number_format2($tdeb, $dec));
+               $rep->TextCol(7, 8,     number_format2($tcre, $dec));
                $rep->NewLine();
        }       
        $rep->TextCol(0, 2, _("Ending Balance"));
 
-       if ($prev['balance'] >= 0.0)
-               $rep->TextCol(2, 3,     number_format2($prev['balance'], $dec));
+       if ($pbal >= 0.0)
+               $rep->TextCol(2, 3,     number_format2($pbal, $dec));
        else
-               $rep->TextCol(3, 4,     number_format2(abs($prev['balance']), $dec));
-       if ($curr['balance'] >= 0.0)
-               $rep->TextCol(4, 5,     number_format2($curr['balance'], $dec));
+               $rep->TextCol(3, 4,     number_format2(abs($pbal), $dec));
+       if ($cbal >= 0.0)
+               $rep->TextCol(4, 5,     number_format2($cbal, $dec));
        else
-               $rep->TextCol(5, 6,     number_format2(abs($curr['balance']), $dec));
-       if ($tot['balance'] >= 0.0)
-               $rep->TextCol(6, 7,     number_format2($tot['balance'], $dec));
+               $rep->TextCol(5, 6,     number_format2(abs($cbal), $dec));
+       if ($tbal >= 0.0)
+               $rep->TextCol(6, 7,     number_format2($tbal, $dec));
        else
-               $rep->TextCol(7, 8,     number_format2(abs($tot['balance']), $dec));
+               $rep->TextCol(7, 8,     number_format2(abs($tbal), $dec));
        
        $rep->Line($rep->row - 6);