X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep103.php;h=9f1e797b29691ad598dbf9aa2fa948ad747cc88a;hb=f44132511cc91b83f20f91af0625d4b112b4c26e;hp=bf5efdbd6367ecb33851a2940d0b60b230edf068;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/reporting/rep103.php b/reporting/rep103.php
index bf5efdbd..9f1e797b 100644
--- a/reporting/rep103.php
+++ b/reporting/rep103.php
@@ -29,46 +29,42 @@ print_customer_details_listing();
 
 function get_customer_details_for_report($area=0, $salesid=0)
 {
-	$sql = "SELECT ".TB_PREF."debtors_master.debtor_no,
-			".TB_PREF."debtors_master.name,
-			".TB_PREF."debtors_master.address,
-			".TB_PREF."debtors_master.curr_code,
-			".TB_PREF."debtors_master.dimension_id,
-			".TB_PREF."debtors_master.dimension2_id,
-			".TB_PREF."debtors_master.notes,
-			".TB_PREF."sales_types.sales_type,
-			".TB_PREF."cust_branch.branch_code,
-			".TB_PREF."cust_branch.br_name,
-			".TB_PREF."cust_branch.br_address,
-			".TB_PREF."cust_branch.br_post_address,
-			".TB_PREF."cust_branch.area,
-			".TB_PREF."cust_branch.salesman,
-			".TB_PREF."areas.description,
-			".TB_PREF."salesman.salesman_name
-		FROM ".TB_PREF."debtors_master
-		INNER JOIN ".TB_PREF."cust_branch
-			ON ".TB_PREF."debtors_master.debtor_no=".TB_PREF."cust_branch.debtor_no
-		INNER JOIN ".TB_PREF."sales_types
-			ON ".TB_PREF."debtors_master.sales_type=".TB_PREF."sales_types.id
-		INNER JOIN ".TB_PREF."areas
-			ON ".TB_PREF."cust_branch.area = ".TB_PREF."areas.area_code
-		INNER JOIN ".TB_PREF."salesman
-			ON ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code
-		WHERE ".TB_PREF."debtors_master.inactive = 0";
+	$sql = "SELECT debtor.debtor_no,
+			debtor.name,
+			debtor.address,
+			debtor.curr_code,
+			debtor.dimension_id,
+			debtor.dimension2_id,
+			debtor.notes,
+			pricelist.sales_type,
+			branch.branch_code,
+			branch.br_name,
+			branch.br_address,
+			branch.br_post_address,
+			branch.area,
+			branch.salesman,
+			area.description,
+			salesman.salesman_name
+		FROM ".TB_PREF."debtors_master debtor
+		INNER JOIN ".TB_PREF."cust_branch branch ON debtor.debtor_no=branch.debtor_no
+		INNER JOIN ".TB_PREF."sales_types pricelist	ON debtor.sales_type=pricelist.id
+		INNER JOIN ".TB_PREF."areas area ON branch.area = area.area_code
+		INNER JOIN ".TB_PREF."salesman salesman	ON branch.salesman=salesman.salesman_code
+		WHERE debtor.inactive = 0";
 	if ($area != 0)
 	{
 		if ($salesid != 0)
-			$sql .= " AND ".TB_PREF."salesman.salesman_code=".db_escape($salesid)."
-				AND ".TB_PREF."areas.area_code=".db_escape($area);
+			$sql .= " AND salesman.salesman_code=".db_escape($salesid)."
+				AND area.area_code=".db_escape($area);
 		else
-			$sql .= " AND ".TB_PREF."areas.area_code=".db_escape($area);
+			$sql .= " AND area.area_code=".db_escape($area);
 	}
 	elseif ($salesid != 0)
-		$sql .= " AND ".TB_PREF."salesman.salesman_code=".db_escape($salesid);
+		$sql .= " AND salesman.salesman_code=".db_escape($salesid);
 	$sql .= " ORDER BY description,
-			".TB_PREF."salesman.salesman_name,
-			".TB_PREF."debtors_master.debtor_no,
-			".TB_PREF."cust_branch.branch_code";
+			salesman.salesman_name,
+			debtor.debtor_no,
+			branch.branch_code";
 
     return db_query($sql,"No transactions were returned");
 }
@@ -76,7 +72,9 @@ function get_customer_details_for_report($area=0, $salesid=0)
 function get_contacts_for_branch($branch)
 {
 	$sql = "SELECT p.*, r.action, r.type, CONCAT(r.type,'.',r.action) as ext_type 
-		FROM ".TB_PREF."crm_persons p,".TB_PREF."crm_contacts r WHERE r.person_id=p.id AND r.type='cust_branch' 
+		FROM ".TB_PREF."crm_persons p,"
+			.TB_PREF."crm_contacts r
+		WHERE r.person_id=p.id AND r.type='cust_branch' 
 			AND r.entity_id=".db_escape($branch);
 	$res = db_query($sql, "can't retrieve branch contacts");
 	$results = array();