PHP 8 rerun of number_format fix.

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

diff --git a/reporting/rep206.php b/reporting/rep206.php
index 6ca549dd3925b2d8581bd1a3640aed7224f12b4e..776b13e46b2319b2501bd2394c085fc2199fd3e9 100644 (file)
--- a/reporting/rep206.php
+++ b/reporting/rep206.php
@@ -134,11 +134,11 @@ function print_supplier_balances()
     $total = array();
     $grandtotal = array(0,0,0,0);
 
-    $sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers";
+    $sql = "SELECT supplier_id, supp_name AS name, curr_code, inactive FROM ".TB_PREF."suppliers";
     if ($fromsupp != ALL_TEXT)
         $sql .= " WHERE supplier_id=".db_escape($fromsupp);
     $sql .= " ORDER BY supp_name";
-    $result = db_query($sql, "The customers could not be retrieved");
+    $result = db_query($sql, "The suppliers could not be retrieved");
 
        $tot_cur_cr = $tot_cur_db = 0;
     while ($myrow=db_fetch($result))
@@ -148,10 +148,10 @@ function print_supplier_balances()
         $accumulate = 0;
         $rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1;
         $bal = get_open_balance($myrow['supplier_id'], $from);
-        $init[0] = $init[1] = 0.0;
-        $init[0] = round2(abs($bal['charges']*$rate), $dec);
-        $init[1] = round2(Abs($bal['credits']*$rate), $dec);
-        $init[2] = round2($bal['Allocated']*$rate, $dec);
+               $init = array();
+        $init[0] = round2(($bal != false ? abs($bal['charges']) : 0)*$rate, $dec);
+        $init[1] = round2(($bal != false ? abs($bal['credits']) : 0)*$rate, $dec);
+        $init[2] = round2(($bal != false ? $bal['Allocated'] : 0)*$rate, $dec);
 
         $init[3] = $init[1] - $init[0];
         $accumulate += $init[3];
@@ -167,7 +167,7 @@ function print_supplier_balances()
 
         if (db_num_rows($res) == 0 && !$no_zeros) 
         {
-            $rep->TextCol(0, 2, $myrow['name']);
+            $rep->TextCol(0, 2, $myrow['name'].($myrow['inactive']==1 ? " ("._("Inactive").")" : ""));
             $rep->AmountCol(3, 4, $init[3], $dec);
             $rep->AmountCol(7, 8, $init[3], $dec);
             //$rep->Line($rep->row  - 2);
@@ -178,7 +178,7 @@ function print_supplier_balances()
         $curr_db = $curr_cr = 0;
         while ($trans=db_fetch($res))
         {
-            if ($no_zeros && floatcmp(abs($trans['TotalAmount']), $trans['Allocated']) == 0) continue;
+            //if ($no_zeros && floatcmp(abs($trans['TotalAmount']), $trans['Allocated']) == 0) continue;
             $item[0] = $item[1] = 0.0;
             if ($trans['TotalAmount'] > 0.0)
             {
@@ -209,7 +209,7 @@ function print_supplier_balances()
             $total[3] = $total[1] - $total[0];
         }
                if ($no_zeros && $total[3] == 0.0 && $curr_db == 0.0 && $curr_cr == 0.0) continue;
-        $rep->TextCol(0, 2, $myrow['name']);
+        $rep->TextCol(0, 2, $myrow['name'].($myrow['inactive']==1 ? " ("._("Inactive").")" : ""));
         $rep->AmountCol(3, 4, $total[3] + $curr_cr - $curr_db, $dec);
         $rep->AmountCol(4, 5, $curr_db, $dec);
         $rep->AmountCol(5, 6, $curr_cr, $dec);