X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep202.php;h=d327f8b9771ae77cb7bab72d9c88bfedf6cc2cab;hb=3c1ca6e8e69a5c362ba2423c477c7e8351475563;hp=c61c2aa5dd9ba290d8df939f8a7f69622895e764;hpb=bd8f517d30d1edd3261e26e582ddd9e11c555616;p=fa-stable.git

diff --git a/reporting/rep202.php b/reporting/rep202.php
index c61c2aa5..d327f8b9 100644
--- a/reporting/rep202.php
+++ b/reporting/rep202.php
@@ -37,32 +37,30 @@ function get_invoices($supplier_id, $to, $all=true)
 
 	// Revomed allocated from sql
 	if ($all)
-    	$value = "(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)";
+    	$value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount)";
     else
-    	$value = "IF (".TB_PREF."supp_trans.type=".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type=".ST_BANKDEPOSIT.", 
-    	(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount - ".TB_PREF."supp_trans.alloc),
-    	(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount + ".TB_PREF."supp_trans.alloc))";
-	$due = "IF (".TB_PREF."supp_trans.type=".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type=".ST_SUPPCREDIT.",".TB_PREF."supp_trans.due_date,".TB_PREF."supp_trans.tran_date)";
-	$sql = "SELECT ".TB_PREF."supp_trans.type,
-		".TB_PREF."supp_trans.reference,
-		".TB_PREF."supp_trans.tran_date,
+    	$value = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT.", 
+    	(trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc),
+    	(trans.ov_amount + trans.ov_gst + trans.ov_discount + trans.alloc))";
+	$due = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_SUPPCREDIT.",trans.due_date,trans.tran_date)";
+	$sql = "SELECT trans.type,
+		trans.reference,
+		trans.tran_date,
 		$value as Balance,
-		IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= 0,$value,0) AS Due,
-		IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $PastDueDays1,$value,0) AS Overdue1,
-		IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $PastDueDays2,$value,0) AS Overdue2
-
-		FROM ".TB_PREF."suppliers,
-			".TB_PREF."payment_terms,
-			".TB_PREF."supp_trans
-
-	   	WHERE ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator
-			AND ".TB_PREF."suppliers.supplier_id = ".TB_PREF."supp_trans.supplier_id
-			AND ".TB_PREF."supp_trans.supplier_id = $supplier_id
-			AND ".TB_PREF."supp_trans.tran_date <= '$todate'
-			AND ABS(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount) > ".FLOAT_COMP_DELTA." ";
+		IF ((TO_DAYS('$todate') - TO_DAYS($due)) > 0,$value,0) AS Due,
+		IF ((TO_DAYS('$todate') - TO_DAYS($due)) > $PastDueDays1,$value,0) AS Overdue1,
+		IF ((TO_DAYS('$todate') - TO_DAYS($due)) > $PastDueDays2,$value,0) AS Overdue2
+
+		FROM ".TB_PREF."suppliers supplier,
+			".TB_PREF."supp_trans trans
+
+	   	WHERE supplier.supplier_id = trans.supplier_id
+			AND trans.supplier_id = $supplier_id
+			AND trans.tran_date <= '$todate'
+			AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) > ".FLOAT_COMP_DELTA;
 	if (!$all)
-		$sql .= "AND ABS(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount) - ".TB_PREF."supp_trans.alloc > ".FLOAT_COMP_DELTA." ";  
-	$sql .= "ORDER BY ".TB_PREF."supp_trans.tran_date";
+		$sql .= " AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc > ".FLOAT_COMP_DELTA;
+	$sql .= " ORDER BY trans.tran_date";
 
 
 	return db_query($sql, "The supplier details could not be retrieved");