X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcustalloc_db.inc;h=9152a3f41142dbba608c1a3117168bb525c57673;hb=2a0f29497517eca1cde8b2832da5761edefb2268;hp=44bdcb2383dacc0d55095a514cb2ce29b3779ef4;hpb=a9abd72df4aa0cbc4fb6f422f2a1412421c435fc;p=fa-stable.git

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index 44bdcb23..9152a3f4 100644
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 //----------------------------------------------------------------------------------------
 
 function add_cust_allocation($amount, $trans_type_from, $trans_no_from,
@@ -70,7 +79,7 @@ function clear_cust_alloctions($type, $type_no, $date="")
 		// 2008-09-20 Joe Hunt
 		if ($date != "")
 			exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date,
-				$row['amt'], payment_person_types::customer(), true);
+				$row['amt'], PT_CUSTOMER, true);
 		//////////////////////
 	}
 
@@ -84,17 +93,19 @@ function clear_cust_alloctions($type, $type_no, $date="")
 }
 //----------------------------------------------------------------------------------------
 
-function get_customer_transactions($extra_fields=null, $extra_conditions=null, $extra_tables=null)
+function get_alloc_trans_sql($extra_fields=null, $extra_conditions=null, $extra_tables=null)
 {
-	$sql = "SELECT trans.trans_no,
+	$sql = "SELECT
 		trans.type,
-		trans.tran_date,
-		trans.due_date,
+		trans.trans_no,
 		trans.reference,
-		trans.alloc,
-		ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
-		debtor.name AS DebtorName, debtor.address,
+		trans.tran_date,
+		debtor.name AS DebtorName, 
 		debtor.curr_code, 
+		ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
+		trans.alloc,
+		trans.due_date,
+		debtor.address,
 		trans.version ";
 
 	if ($extra_fields)
@@ -109,16 +120,14 @@ function get_customer_transactions($extra_fields=null, $extra_conditions=null, $
 
 	if ($extra_conditions)
 		$sql .= " AND $extra_conditions ";
-
-	$sql .= " ORDER BY trans_no";
-
-	return db_query($sql, "Cannot retreive debtor transactions");
+	
+	return $sql;
 }
 
 
 //-------------------------------------------------------------------------------------------------------------
 
-function get_allocatable_from_cust_transactions($customer_id, $settled)
+function get_allocatable_from_cust_sql($customer_id, $settled)
 {
 	$settled_sql = "";
 	if (!$settled)
@@ -129,8 +138,10 @@ function get_allocatable_from_cust_transactions($customer_id, $settled)
 	if ($customer_id != null)
 		$cust_sql = " AND trans.debtor_no = $customer_id";
 
-	return get_customer_transactions("round(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc,6) <= 0 AS settled",
-		"(type=12 OR type=11 OR type=2) AND (trans.ov_amount > 0) " . $settled_sql . $cust_sql);
+	$sql = get_alloc_trans_sql("round(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc,6) <= 0 AS settled",
+		"(type=".ST_CUSTPAYMENT." OR type=".ST_CUSTCREDIT." OR type=".ST_BANKDEPOSIT.") AND (trans.ov_amount > 0) " . $settled_sql . $cust_sql);
+
+	return $sql;
 }
 
 //-------------------------------------------------------------------------------------------------------------
@@ -139,7 +150,7 @@ function get_allocatable_to_cust_transactions($customer_id, $trans_no=null, $typ
 {
 	if ($trans_no != null and $type != null)
 	{
-		return get_customer_transactions("amt", "trans.trans_no = alloc.trans_no_to
+		$sql = get_alloc_trans_sql("amt", "trans.trans_no = alloc.trans_no_to
 			AND trans.type = alloc.trans_type_to
 			AND alloc.trans_no_from=$trans_no
 			AND alloc.trans_type_from=$type
@@ -148,13 +159,15 @@ function get_allocatable_to_cust_transactions($customer_id, $trans_no=null, $typ
 	}
 	else
 	{
-		return get_customer_transactions(null, "round(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc,6) > 0
-			AND trans.type != " . systypes::cust_payment() . "
-			AND trans.type != " . systypes::bank_deposit() . "
-			AND trans.type != 11
-			AND trans.type != 13
+		$sql = get_alloc_trans_sql(null, "round(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc,6) > 0
+			AND trans.type <> " . ST_CUSTPAYMENT . "
+			AND trans.type <> " . ST_BANKDEPOSIT . "
+			AND trans.type <> " . ST_CUSTCREDIT . "
+			AND trans.type <> " . ST_CUSTDELIVERY . "
 			AND trans.debtor_no=$customer_id");
 	}
+
+	return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions");
 }