X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep101.php;h=1a800d0077336c50c097970e6ba35382c9341b6b;hb=ce5f33c17196c1f32e05576da2fd9719db60c596;hp=a9bd160952a62fd429b483cefb9f41c29a7515c0;hpb=a67b7a07178dd92bb8e8bf60b6f7b474a1cbf433;p=fa-stable.git

diff --git a/reporting/rep101.php b/reporting/rep101.php
index a9bd1609..1a800d00 100644
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -157,7 +157,7 @@ function print_customer_balances()
 
 	$grandtotal = array(0,0,0,0);
 
-	$sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
+	$sql = "SELECT debtor_no, name, curr_code, inactive FROM ".TB_PREF."debtors_master ";
 	if ($fromcust != ALL_TEXT)
 		$sql .= "WHERE debtor_no=".db_escape($fromcust);
 	$sql .= " ORDER BY name";
@@ -171,26 +171,23 @@ function print_customer_balances()
 		$rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1;
 		$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);
+
+		$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);
 		if ($show_balance)
 		{
 			$init[3] = $init[0] - $init[1];
 			$accumulate += $init[3];
 		}	
 		else	
-			$init[3] = round2($bal['OutStanding']*$rate, $dec);
+			$init[3] = round2(($bal != false ? $bal['OutStanding'] : 0)*$rate, $dec);
 
 		$res = get_transactions($myrow['debtor_no'], $from, $to);
 		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;
@@ -238,7 +235,7 @@ function print_customer_balances()
 			}
 			else
 			{
-				$item[1] = round2(Abs($trans['TotalAmount']) * $rate, $dec);
+				$item[1] = round2(abs($trans['TotalAmount']) * $rate, $dec);
 				$rep->AmountCol(5, 6, $item[1], $dec);
 				$accumulate -= $item[1];
 				$item[2] = round2($trans['Allocated'] * $rate, $dec) * -1;