PHP 8 rerun of number_format fix.

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

diff --git a/reporting/rep201.php b/reporting/rep201.php
index 3b7ee708c7dacdad817dae3be7d6c43669eacedf..21fea412edd0d34d69d058cca11752e8cfcffc3b 100644 (file)
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -38,10 +38,10 @@ function get_open_balance($supplier_id, $to)
     $sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.") AND t.ov_amount>0),
         abs(t.ov_amount + t.ov_gst + t.ov_discount) * -1, 0)) AS credits,";
 
-    $sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.")), t.alloc * -1, t.alloc)) 
+    $sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.") AND t.ov_amount>0), t.alloc * -1, t.alloc)) 
         AS Allocated,";
 
-    $sql .= "SUM(IF(t.type = ".ST_SUPPINVOICE.", 1, -1) *
+    $sql .= "SUM(IF(t.type = ".ST_SUPPINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.") AND t.ov_amount>0), 1, -1) *
         (abs(t.ov_amount + t.ov_gst + t.ov_discount) - abs(t.alloc))) AS OutStanding
         FROM ".TB_PREF."supp_trans t
         WHERE t.supplier_id = ".db_escape($supplier_id);
@@ -136,11 +136,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");
 
        while ($myrow=db_fetch($result))
        {
@@ -164,7 +164,7 @@ function print_supplier_balances()
                if ($no_zeros && db_num_rows($res) == 0) continue;
 
                $rep->fontSize += 2;
-               $rep->TextCol(0, 2, $myrow['name']);
+               $rep->TextCol(0, 2, $myrow['name'].($myrow['inactive']==1 ? " ("._("Inactive").")" : ""));
                if ($convert) $rep->TextCol(2, 3,       $myrow['curr_code']);
                $rep->fontSize -= 2;
                $rep->TextCol(3, 4,     _("Open Balance"));