Clean up after Bugs 5510 and 5512.

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

diff --git a/reporting/rep101.php b/reporting/rep101.php
index dc81dd5a4e4590ffcabe5ca6e24974032e42821b..fd87944f8631231ba43d783a99f3fc12be019b89 100644 (file)
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -115,7 +115,7 @@ function print_customer_balances()
                $cust = _('All');
        else
                $cust = get_customer_name($fromcust);
-       $dec = user_price_dec();
+    $dec = user_price_dec();
 
        if ($show_balance) $sb = _('Yes');
        else $sb = _('No');
@@ -169,7 +169,11 @@ function print_customer_balances()
                $accumulate = 0;
                $rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1;
                $bal = get_open_balance($myrow['debtor_no'], $from);
-               $init[0] = $init[1] = 0.0;
+               $init = array();
+               $bal['charges'] = isset($bal['charges']) ? $bal['charges'] : 0;
+               $bal['credits'] = isset($bal['credits']) ? $bal['credits'] : 0;
+               $bal['Allocated'] = isset($bal['Allocated']) ? $bal['Allocated'] : 0;
+               $bal['OutStanding'] = isset($bal['OutStanding']) ? $bal['OutStanding'] : 0;
                $init[0] = round2(abs($bal['charges']*$rate), $dec);
                $init[1] = round2(Abs($bal['credits']*$rate), $dec);
                $init[2] = round2($bal['Allocated']*$rate, $dec);
@@ -212,7 +216,7 @@ function print_customer_balances()
                 if ($show_balance) {
                     if ($trans['TotalAmount'] == 0) continue;
                 } else {
-                    if (floatcmp($trans['TotalAmount'], $trans['Allocated']) == 0) continue;
+                    if (floatcmp(abs($trans['TotalAmount']), $trans['Allocated']) == 0) continue;
                 }
             }
                        $rep->NewLine(1, 2);
@@ -226,7 +230,7 @@ function print_customer_balances()
                                $trans['TotalAmount'] *= -1;
                        if ($trans['TotalAmount'] > 0.0)
                        {
-                               $item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec);
+                               $item[0] = round2($trans['TotalAmount'] * $rate, $dec);
                                $rep->AmountCol(4, 5, $item[0], $dec);
                                $accumulate += $item[0];
                                $item[2] = round2($trans['Allocated'] * $rate, $dec);
@@ -239,7 +243,7 @@ function print_customer_balances()
                                $item[2] = round2($trans['Allocated'] * $rate, $dec) * -1;
                        }
                        $rep->AmountCol(6, 7, $item[2], $dec);
-                       if ($trans['type'] == ST_JOURNAL || $trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT)
+                       if (($trans['type'] == ST_JOURNAL && $item[0]) || $trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT)
                                $item[3] = $item[0] - $item[2];
                        else    
                                $item[3] = -$item[1] - $item[2];