X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcustalloc_db.inc;fp=sales%2Fincludes%2Fdb%2Fcustalloc_db.inc;h=ec7c3afbea4a45d4de7be743f8a8a2f9dcc7329e;hb=9481e23e6d03f39f7d9e745f86bd1be5f703b96d;hp=42eaff59536c7bdcd2f5ccf4c309ec65718b714d;hpb=9549235b87720c573a2f1e2144d5a1bb55e6e8fc;p=fa-stable.git

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index 42eaff59..ec7c3afb 100644
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -119,8 +119,9 @@ function get_allocatable_from_cust_sql($customer_id=null, $settled)
 	 	.TB_PREF."debtor_trans as trans, "
 		.TB_PREF."debtors_master as debtor"
 	." WHERE trans.debtor_no=debtor.debtor_no
-		AND (((type=".ST_CUSTPAYMENT." OR type=".ST_BANKDEPOSIT.") AND (trans.ov_amount > 0))"
-		." OR ( (type=".ST_CUSTCREDIT. " OR type=".ST_JOURNAL. ") AND (ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount)>0))";
+		AND (((type=".ST_CUSTPAYMENT." OR type=".ST_BANKDEPOSIT.") AND (trans.ov_amount > 0))
+		 OR (type=".ST_CUSTCREDIT. " AND (ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount)>0)
+		 OR (type=".ST_JOURNAL. " AND (trans.ov_amount < 0)))";
 
 	if (!$settled)
 		$sql .= " AND (round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc),6) > 0)";
@@ -216,7 +217,7 @@ function get_allocatable_to_cust_transactions($customer_id = null, $trans_no=nul
 					AND round(-IF(prep_amount, prep_amount, ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount)-alloc,6) > 0
 					OR
 				  	trans.type = '". ST_JOURNAL."'
-					AND ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount<0
+					AND ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount>0
 					OR
 				  	trans.type = '". ST_BANKPAYMENT."'
 					AND ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount>0