PHP 7.4 Bugs in some reports.

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

diff --git a/reporting/rep101.php b/reporting/rep101.php
index 48b43d5fbeabf67ed46629604e4d68e43f593023..4b570d5ad5a92342526d93c6d1eae75573b5018b 100644 (file)
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -41,7 +41,7 @@ function get_open_balance($debtorno, $to)
 
     $sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.")), t.alloc * -1, t.alloc)) AS Allocated,";
 
-       $sql .= "SUM(IF(t.type = ".ST_SALESINVOICE.", 1, -1) *
+       $sql .= "SUM(IF(t.type = ".ST_SALESINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0), 1, -1) *
                        (abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) - abs(t.alloc))) AS OutStanding
                FROM ".TB_PREF."debtor_trans t
        WHERE t.debtor_no = ".db_escape($debtorno)
@@ -115,7 +115,10 @@ 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');
 
        if ($currency == ALL_TEXT)
        {
@@ -140,8 +143,9 @@ function print_customer_balances()
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('Period'), 'from' => $from,          'to' => $to),
                                    2 => array('text' => _('Customer'), 'from' => $cust,        'to' => ''),
-                                   3 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''),
-                                               4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
+                                   3 => array('text' => _('Show Balance'), 'from' => $sb,      'to' => ''),
+                                   4 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''),
+                                               5 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
 
     $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
@@ -164,8 +168,12 @@ 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, $convert);
-               $init[0] = $init[1] = 0.0;
+               $bal = get_open_balance($myrow['debtor_no'], $from);
+               $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);
@@ -235,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_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];