X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep102.php;h=fc2457c4930193c22c27ddfb6daa299015befced;hb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;hp=f8a2a52dfa44715b943e022edb2297ac08afda70;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/reporting/rep102.php b/reporting/rep102.php
index f8a2a52d..fc2457c4 100644
--- a/reporting/rep102.php
+++ b/reporting/rep102.php
@@ -27,7 +27,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 print_aged_customer_analysis();
 
-function get_invoices($costomer_id, $to)
+function get_invoices($customer_id, $to)
 {
 	$todate = date2sql($to);
 	$PastDueDays1 = get_company_pref('past_due_days');
@@ -37,7 +37,7 @@ function get_invoices($costomer_id, $to)
     $value = "(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + "
 		.TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + "
 		.TB_PREF."debtor_trans.ov_discount)";
-	$due = "IF (".TB_PREF."debtor_trans.type=10,".TB_PREF."debtor_trans.due_date,".TB_PREF."debtor_trans.tran_date)";
+	$due = "IF (".TB_PREF."debtor_trans.type=".ST_SALESINVOICE.",".TB_PREF."debtor_trans.due_date,".TB_PREF."debtor_trans.tran_date)";
 	$sql = "SELECT ".TB_PREF."debtor_trans.type, ".TB_PREF."debtor_trans.reference,
 		".TB_PREF."debtor_trans.tran_date,
 		$value as Balance,
@@ -49,10 +49,10 @@ function get_invoices($costomer_id, $to)
 			".TB_PREF."payment_terms,
 			".TB_PREF."debtor_trans
 
-		WHERE ".TB_PREF."debtor_trans.type <> 13
+		WHERE ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
 			AND ".TB_PREF."debtors_master.payment_terms = ".TB_PREF."payment_terms.terms_indicator
 			AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no
-			AND ".TB_PREF."debtor_trans.debtor_no = $costomer_id
+			AND ".TB_PREF."debtor_trans.debtor_no = $customer_id 
 			AND ".TB_PREF."debtor_trans.tran_date <= '$todate'
 			AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) > 0.004
 			ORDER BY ".TB_PREF."debtor_trans.tran_date";
@@ -129,10 +129,10 @@ function print_aged_customer_analysis()
 
 	$total = array(0,0,0,0, 0);
 
-	$sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
+	$sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master";
 	if ($fromcust != ALL_NUMERIC)
-		$sql .= "WHERE debtor_no=$fromcust ";
-	$sql .= "ORDER BY name";
+		$sql .= " WHERE debtor_no=".db_escape($fromcust);
+	$sql .= " ORDER BY name";
 	$result = db_query($sql, "The customers could not be retrieved");
 
 	while ($myrow=db_fetch($result))
@@ -177,7 +177,7 @@ function print_aged_customer_analysis()
         		$rep->TextCol(0, 1, $systypes_array[$trans['type']], -2);
 				$rep->TextCol(1, 2,	$trans['reference'], -2);
 				$rep->DateCol(2, 3, $trans['tran_date'], true, -2);
-				if ($trans['type'] == 11 || $trans['type'] == 12 || $trans['type'] == 2)
+				if ($trans['type'] == ST_CUSTCREDIT || $trans['type'] == ST_CUSTPAYMENT || $trans['type'] == ST_BANKDEPOSIT)
 				{
 					$trans['Balance'] *= -1;
 					$trans['Due'] *= -1;