X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcustalloc_db.inc;h=9dfae6e8fa0234d2a0360f0d07b1dbca60c2a82b;hb=7b0f3f68c9aaeffec2f57af1160efaabf7a5abcb;hp=88e867459cad62b09bdf404c6563012066b0f5fe;hpb=0c1bcd8ce3c089d7ddb3722a097f8fc8417f41e6;p=fa-stable.git

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index 88e86745..9dfae6e8 100644
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -2,14 +2,14 @@
 
 //----------------------------------------------------------------------------------------
 
-function add_cust_allocation($amount, $trans_type_from, $trans_no_from, 
+function add_cust_allocation($amount, $trans_type_from, $trans_no_from,
 	$trans_type_to, $trans_no_to)
 {
 	$sql = "INSERT INTO ".TB_PREF."cust_allocations (
-		amt, date_alloc, 
-		trans_type_from, trans_no_from, trans_no_to, trans_type_to) 
+		amt, date_alloc,
+		trans_type_from, trans_no_from, trans_no_to, trans_type_to)
 		VALUES ($amount, Now(), $trans_type_from, $trans_no_from, $trans_no_to, $trans_type_to)";
-			
+
 	db_query($sql, "A customer allocation could not be added to the database");
 }
 
@@ -26,12 +26,12 @@ function delete_cust_allocation($trans_id)
 
 function get_DebtorTrans_allocation_balance($trans_type, $trans_no)
 {
-	
-	$sql = "SELECT (ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc) AS BalToAllocate 
+
+	$sql = "SELECT (ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc) AS BalToAllocate
 		FROM ".TB_PREF."debtor_trans WHERE trans_no=$trans_no AND type=$trans_type";
 	$result = db_query($sql,"calculate the allocation");
-	$myrow = db_fetch_row($result);	
-	
+	$myrow = db_fetch_row($result);
+
 	return $myrow[0];
 }
 
@@ -56,26 +56,26 @@ function void_cust_allocations($type, $type_no)
 function clear_cust_alloctions($type, $type_no)
 {
 	// clear any allocations for this transaction
-	$sql = "SELECT * FROM ".TB_PREF."cust_allocations 
-		WHERE (trans_type_from=$type AND trans_no_from=$type_no) 
+	$sql = "SELECT * FROM ".TB_PREF."cust_allocations
+		WHERE (trans_type_from=$type AND trans_no_from=$type_no)
 		OR (trans_type_to=$type AND trans_no_to=$type_no)";
 	$result = db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no");
-	
+
 	while ($row = db_fetch($result))
 	{
 		$sql = "UPDATE ".TB_PREF."debtor_trans SET alloc=alloc - " . $row['amt'] . "
-			WHERE (type= " . $row['trans_type_from'] . " AND trans_no=" . $row['trans_no_from'] . ") 
+			WHERE (type= " . $row['trans_type_from'] . " AND trans_no=" . $row['trans_no_from'] . ")
 			OR (type=" . $row['trans_type_to'] . " AND trans_no=" . $row['trans_no_to'] . ")";
-		db_query($sql, "could not clear allocation");						
+		db_query($sql, "could not clear allocation");
 	}
-						
+
 
 	// remove any allocations for this transaction
-	$sql = "DELETE FROM ".TB_PREF."cust_allocations 
-		WHERE (trans_type_from=$type AND trans_no_from=$type_no) 
+	$sql = "DELETE FROM ".TB_PREF."cust_allocations
+		WHERE (trans_type_from=$type AND trans_no_from=$type_no)
 		OR (trans_type_to=$type AND trans_no_to=$type_no)";
-				
-	db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no");					
+
+	db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no");
 }
 
 //-------------------------------------------------------------------------------------------------------------
@@ -83,38 +83,40 @@ function clear_cust_alloctions($type, $type_no)
 function get_allocatable_from_cust_transactions($customer_id, $settled)
 {
 	$settled_sql = "";
-	if (!$settled) 
+	if (!$settled)
 	{
 		$settled_sql = " AND (round(ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc,6) > 0)";
 	}
 	$cust_sql = "";
 	if ($customer_id != null)
 		$cust_sql = " AND ".TB_PREF."debtor_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) AND (".TB_PREF."debtor_trans.ov_amount > 0) " . $settled_sql . $cust_sql);	
+
+	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 (".TB_PREF."debtor_trans.ov_amount > 0) " . $settled_sql . $cust_sql);
 }
 
 //-------------------------------------------------------------------------------------------------------------
 
 function get_allocatable_to_cust_transactions($customer_id, $trans_no=null, $type=null)
-{	
-	if ($trans_no != null and $type != null) 
+{
+	if ($trans_no != null and $type != null)
 	{
-		return get_customer_transactions("amt", "".TB_PREF."debtor_trans.trans_no = ".TB_PREF."cust_allocations.trans_no_to 
+		return get_customer_transactions("amt", "".TB_PREF."debtor_trans.trans_no = ".TB_PREF."cust_allocations.trans_no_to
 			AND ".TB_PREF."debtor_trans.type = ".TB_PREF."cust_allocations.trans_type_to
 			AND ".TB_PREF."cust_allocations.trans_no_from=$trans_no
-			AND ".TB_PREF."cust_allocations.trans_type_from=$type 
-			AND ".TB_PREF."debtor_trans.debtor_no=$customer_id", 
-			"".TB_PREF."cust_allocations");						
-	} 
-	else 
+			AND ".TB_PREF."cust_allocations.trans_type_from=$type
+			AND ".TB_PREF."debtor_trans.debtor_no=$customer_id",
+			"".TB_PREF."cust_allocations");
+	}
+	else
 	{
 		return get_customer_transactions(null, "round(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc,6) > 0
 			AND ".TB_PREF."debtor_trans.type != " . systypes::cust_payment() . "
+			AND ".TB_PREF."debtor_trans.type != " . systypes::bank_deposit() . "
+			AND ".TB_PREF."debtor_trans.type != 11
 			AND ".TB_PREF."debtor_trans.type != 13
 			AND ".TB_PREF."debtor_trans.debtor_no=$customer_id");
-	}															
+	}
 }