X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep206.php;h=776b13e46b2319b2501bd2394c085fc2199fd3e9;hb=9561c66909d960cd75bcbb08bae2132f3de7e6da;hp=79f4f1f3b40338eeac0db6085069661037056eb7;hpb=0ce53780d575e7bf4eefaa1b7edc0603131cc2b3;p=fa-stable.git

diff --git a/reporting/rep206.php b/reporting/rep206.php
index 79f4f1f3..776b13e4 100644
--- 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))
@@ -149,13 +149,9 @@ function print_supplier_balances()
         $rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1;
         $bal = get_open_balance($myrow['supplier_id'], $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);
+        $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];
@@ -171,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);
@@ -213,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);