Merged bugfixes since 2.0.6

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

diff --git a/reporting/rep101.php b/reporting/rep101.php
index b51b44885ac72ecc772c733132401b68ecbbc4f6..f8e04caa6873816f1ef9afb1d14f02aed68a05e9 100644 (file)
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -134,20 +134,26 @@ function print_customer_balances()
                                $trans['TotalAmount'] *= -1;
                        if ($trans['TotalAmount'] > 0.0)
                        {
-                               $item[0] = abs($trans['TotalAmount']) * $rate;
+                               $item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec);
                                $rep->TextCol(4, 5,     number_format2($item[0], $dec));
                        }
                        else
                        {
-                               $item[1] = Abs($trans['TotalAmount']) * $rate;
+                               $item[1] = round2(Abs($trans['TotalAmount']) * $rate, $dec);
                                $rep->TextCol(5, 6,     number_format2($item[1], $dec));
                        }
-                       $item[2] = $trans['Allocated'] * $rate;
+                       $item[2] = round2($trans['Allocated'] * $rate, $dec);
                        $rep->TextCol(6, 7,     number_format2($item[2], $dec));
+                       /*
                        if ($trans['type'] == 10)
                                $item[3] = ($trans['TotalAmount'] - $trans['Allocated']) * $rate;
                        else
                                $item[3] = ($trans['TotalAmount'] + $trans['Allocated']) * $rate;
+                       */
+                       if ($trans['type'] == 10)
+                               $item[3] = $item[0] + $item[1] - $item[2];
+                       else    
+                               $item[3] = $item[0] - $item[1] + $item[2];
                        $rep->TextCol(7, 8, number_format2($item[3], $dec));
                        for ($i = 0; $i < 4; $i++)
                        {