From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Wed, 23 Jun 2010 06:28:33 +0000 (+0000)
Subject: Restored customer payment display in cutomer transactions inquire.
X-Git-Tag: v2.4.2~19^2~832
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=71d8b3552ba81fa2570ec29514570b7ce1b044da;p=fa-stable.git

Restored customer payment display in cutomer transactions inquire.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 00171693..08368e4a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,11 +19,15 @@ Legend:
 ! -> Note
 $ -> Affected files
 
-24-Jun-2010 Janusz Dobrowolski
+23-Jun-2010 Janusz Dobrowolski
+# Restored customer payments display
+$ /sales/includes/db/cust_trans_db.inc
+
+22-Jun-2010 Janusz Dobrowolski
 # Fixed pos parameters retrieval in direct invoice
 $ /sales/includes/cart_class.inc
 
-24-Jun-2010 Janusz Dobrowolski
+21-Jun-2010 Janusz Dobrowolski
 + Support for current credit display
 $ /includes/ui/ui_input.inc
   /purchasing/po_entry_items.php
diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 4b10acc6..ef693a6c 100644
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -405,15 +405,15 @@ function get_sql_for_customer_inquiry()
 //			(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount))) , ";
 		$sql .= "trans.alloc AS Allocated,
 		((trans.type = ".ST_SALESINVOICE.")
-			AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
+			AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue ,
 		Sum(line.quantity-line.qty_done) AS Outstanding
 		FROM "
-			.TB_PREF."debtor_trans as trans, "
+			.TB_PREF."debtor_trans as trans
+			LEFT JOIN ".TB_PREF."debtor_trans_details as line
+				ON trans.trans_no=line.debtor_trans_no AND trans.type=line.debtor_trans_type,"
 			.TB_PREF."debtors_master as debtor, "
-			.TB_PREF."cust_branch as branch, "
-			.TB_PREF."debtor_trans_details as line
+			.TB_PREF."cust_branch as branch
 		WHERE debtor.debtor_no = trans.debtor_no
-			AND trans.trans_no=line.debtor_trans_no AND trans.type=line.debtor_trans_type
 			AND trans.tran_date >= '$date_after'
 			AND trans.tran_date <= '$date_to'
 			AND trans.branch_code = branch.branch_code";
@@ -454,6 +454,7 @@ function get_sql_for_customer_inquiry()
     	}
    	}
 	$sql .= " GROUP BY trans.trans_no, trans.type";
+
    	return $sql;
 }