From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 14 Aug 2011 22:23:24 +0000 (+0200)
Subject: 0000987: In Supplier Payments allocation list should display Supplier Reference if... 
X-Git-Tag: 2.3-final~584
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=36b1fadae4301de56c7dc2e3ffdf200c4a5a8344;p=fa-stable.git

0000987: In Supplier Payments allocation list should display Supplier Reference if possible
---

diff --git a/purchasing/includes/db/suppalloc_db.inc b/purchasing/includes/db/suppalloc_db.inc
index f9eed1a8..017feeea 100644
--- a/purchasing/includes/db/suppalloc_db.inc
+++ b/purchasing/includes/db/suppalloc_db.inc
@@ -103,8 +103,8 @@ function get_alloc_supp_sql($extra_fields=null, $extra_conditions=null, $extra_t
 	$sql = "SELECT
 		trans.type,
 		trans.trans_no,
-		trans.reference,
-		trans.tran_date,
+		IF(trans.supp_reference='',trans.reference,trans.supp_reference) as reference,
+ 		trans.tran_date,
 		supplier.supp_name, 
 		supplier.curr_code, 
 		ov_amount+ov_gst+ov_discount AS Total,
@@ -112,11 +112,7 @@ function get_alloc_supp_sql($extra_fields=null, $extra_conditions=null, $extra_t
 		trans.due_date,
 		trans.supplier_id,
 		supplier.address";
-/*	$sql = "SELECT trans.*,
-		ov_amount+ov_gst+ov_discount AS Total,
-		supplier.supp_name, supplier.address,
-		supplier.curr_code ";
-*/
+
 	if ($extra_fields)
 		$sql .= ", $extra_fields ";
 
@@ -128,7 +124,7 @@ function get_alloc_supp_sql($extra_fields=null, $extra_conditions=null, $extra_t
 
 	if ($extra_conditions)
 		$sql .= " AND $extra_conditions";
-
+	
 	return $sql;
 }
 
@@ -173,7 +169,7 @@ function get_allocatable_to_supp_transactions($supplier_id, $trans_no=null, $typ
 			AND trans.supplier_id=".db_escape($supplier_id));
 	}
 
-	return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions");
+	return db_query($sql." ORDER BY due_date", "Cannot retreive alloc to transactions");
 }
 
 function get_sql_for_supplier_allocation_inquiry()