X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep108.php;h=abb11e7f50227a8b386b6eeb940784eee48e37e1;hb=48589f9ce6c51bb25e2fa8ed83c57d9dfa485e44;hp=b47995418ed70f2ec718226f293d6dd0d3cf4470;hpb=f44132511cc91b83f20f91af0625d4b112b4c26e;p=fa-stable.git

diff --git a/reporting/rep108.php b/reporting/rep108.php
index b4799541..abb11e7f 100644
--- a/reporting/rep108.php
+++ b/reporting/rep108.php
@@ -32,16 +32,24 @@ print_statements();
 
 function getTransactions($debtorno, $date, $show_also_allocated)
 {
-    $sql = "SELECT *,
-    			(ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) AS TotalAmount, alloc AS Allocated,
-				((type = ".ST_SALESINVOICE.") AND due_date < '$date') AS OverDue
-			FROM ".TB_PREF."debtor_trans
-			WHERE tran_date <= '$date' AND debtor_no = ".db_escape($debtorno)."
-   				AND type <> ".ST_CUSTDELIVERY."
-				AND ABS(ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) > ". FLOAT_COMP_DELTA;
-
-	if (!$show_also_allocated)
-		$sql .= " AND ABS(ABS(ov_amount + ov_gst + ov_freight +	ov_freight_tax + ov_discount) - alloc) > ". FLOAT_COMP_DELTA;
+    $sql = "SELECT trans.type,
+        trans.trans_no,
+        trans.order_,
+        trans.reference,
+        trans.tran_date,
+        trans.due_date,
+        IF(prep_amount, prep_amount, ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) AS TotalAmount,
+        alloc AS Allocated,
+		((trans.type = ".ST_SALESINVOICE.") AND due_date < '$date') AS OverDue
+		FROM ".TB_PREF."debtor_trans trans
+		LEFT JOIN ".TB_PREF."voided as v
+            ON trans.trans_no=v.id AND trans.type=v.type
+        WHERE tran_date <= '$date' AND debtor_no = ".db_escape($debtorno)."
+			AND trans.type <> ".ST_CUSTDELIVERY." AND ISNULL(v.date_)
+			AND ABS(ABS(ov_amount) + ov_gst + ov_freight + ov_freight_tax + ov_discount) > ". FLOAT_COMP_DELTA;
+	
+  	if (!$show_also_allocated)
+		$sql .= " AND ABS(IF(prep_amount, prep_amount, ABS(ov_amount) + ov_gst + ov_freight + ov_freight_tax + ov_discount) - alloc) > ". FLOAT_COMP_DELTA;
 	$sql .= " ORDER BY tran_date";
 
     return db_query($sql,"No transactions were returned");
@@ -77,8 +85,6 @@ function print_statements()
 	$PastDueDays1 = get_company_pref('past_due_days');
 	$PastDueDays2 = 2 * $PastDueDays1;
 
-	if ($email == 0)
-		$rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
     	recalculate_cols($cols);
 
@@ -103,6 +109,8 @@ function print_statements()
 		$params['bankaccount'] = $baccount['id'];
 		if (db_num_rows($TransResult) == 0)
 			continue;
+        if ($email == 0 && !isset($rep))
+            $rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize(), 9, $orientation);
 		if ($email == 1)
 		{
 			$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
@@ -130,14 +138,15 @@ function print_statements()
 		{
 			$DisplayTotal = number_format2(Abs($myrow2["TotalAmount"]),$dec);
 			$DisplayAlloc = number_format2($myrow2["Allocated"],$dec);
-			$DisplayNet = number_format2($myrow2["TotalAmount"] - $myrow2["Allocated"],$dec);
+			$DisplayNet = number_format2(Abs($myrow2["TotalAmount"]) - $myrow2["Allocated"],$dec);
 
 			$rep->TextCol(0, 1, $systypes_array[$myrow2['type']], -2);
 			$rep->TextCol(1, 2,	$myrow2['reference'], -2);
 			$rep->TextCol(2, 3,	sql2date($myrow2['tran_date']), -2);
 			if ($myrow2['type'] == ST_SALESINVOICE)
 				$rep->TextCol(3, 4,	sql2date($myrow2['due_date']), -2);
-			if ($myrow2['type'] == ST_SALESINVOICE || $myrow2['type'] == ST_BANKPAYMENT)
+			if ($myrow2['type'] == ST_SALESINVOICE || $myrow2['type'] == ST_BANKPAYMENT || ($myrow2['type'] == ST_JOURNAL && 
+				$myrow2["TotalAmount"] > 0))
 				$rep->TextCol(4, 5,	$DisplayTotal, -2);
 			else
 				$rep->TextCol(5, 6,	$DisplayTotal, -2);
@@ -169,7 +178,10 @@ function print_statements()
 			$rep->End($email, _("Statement") . " " . _("as of") . " " . sql2date($date));
 
 	}
-	if ($email == 0)
+
+    if (!isset($rep))
+        display_notification("No customers with outstanding balances found");
+	else if ($email == 0)
 		$rep->End();
 }