X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcustalloc_db.inc;h=b7c4607383ce421335ef3d33b32631b1dc7c9c46;hb=87e4961d8cb13efab395b6a5548164d6a748bf3d;hp=c80378c6737ad710dce7ac8ff85ba03d794b7b2c;hpb=4528afda32783ab1b4e5e88fe19e2136a3f060e1;p=fa-stable.git

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index c80378c6..b7c46073 100644
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -33,11 +33,18 @@ function delete_cust_allocation($trans_id)
 }
 
 //----------------------------------------------------------------------------------------
-
-function update_debtor_trans_allocation($trans_type, $trans_no, $alloc)
+//	Update debtor trans alloc field according to current status of cust_allocations
+//
+function update_debtor_trans_allocation($trans_type, $trans_no)
 {
-	$sql = "UPDATE ".TB_PREF."debtor_trans SET alloc = alloc + $alloc
-		WHERE type=".db_escape($trans_type)." AND trans_no = ".db_escape($trans_no);
+	$sql = "UPDATE `".TB_PREF."debtor_trans` trans,
+			(SELECT sum(amt) amt from ".TB_PREF."cust_allocations
+				WHERE (trans_type_to=".db_escape($trans_type)." AND trans_no_to=".db_escape($trans_no).")
+				OR (trans_type_from=".db_escape($trans_type)." AND trans_no_from=".db_escape($trans_no).")) allocated
+		SET 
+			trans.alloc=IFNULL(allocated.amt,0)
+		WHERE trans.type=".db_escape($trans_type)." AND trans_no=".db_escape($trans_no);
+
 	db_query($sql, "The debtor transaction record could not be modified for the allocation against it");
 }
 
@@ -94,7 +101,8 @@ function get_alloc_trans_sql($extra_fields=null, $extra_conditions=null, $extra_
 		trans.alloc,
 		trans.due_date,
 		debtor.address,
-		trans.version ";
+		trans.version,
+		trans.debtor_no ";
 
 	if ($extra_fields)
 		$sql .= ", $extra_fields ";
@@ -184,10 +192,10 @@ function get_allocatable_from_cust_transactions($customer_id, $trans_no=null, $t
 	return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions");
 }
 
-function get_sql_for_customer_allocation_inquiry()
+function get_sql_for_customer_allocation_inquiry($from, $to, $customer, $filterType, $settled)
 {
-  	$data_after = date2sql($_POST['TransAfterDate']);
-  	$date_to = date2sql($_POST['TransToDate']);
+  	$data_after = date2sql($from);
+  	$date_to = date2sql($to);
 
   	$sql = "SELECT 
   		trans.type,
@@ -202,7 +210,8 @@ function get_sql_for_customer_allocation_inquiry()
 			+ trans.ov_freight_tax + trans.ov_discount)	AS TotalAmount,
 		trans.alloc AS Allocated,
 		((trans.type = ".ST_SALESINVOICE.")
-			AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
+			AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
+		trans.debtor_no
     	FROM "
 			.TB_PREF."debtor_trans as trans, "
 			.TB_PREF."debtors_master as debtor
@@ -212,25 +221,25 @@ function get_sql_for_customer_allocation_inquiry()
     		AND trans.tran_date >= '$data_after'
     		AND trans.tran_date <= '$date_to'";
 
-   	if ($_POST['customer_id'] != ALL_TEXT)
-   		$sql .= " AND trans.debtor_no = ".db_escape($_POST['customer_id']);
+   	if ($customer != ALL_TEXT)
+   		$sql .= " AND trans.debtor_no = ".db_escape($customer);
 
-   	if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
+   	if (isset($filterType) && $filterType != ALL_TEXT)
    	{
-   		if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2')
+   		if ($filterType == '1' || $filterType == '2')
    		{
    			$sql .= " AND trans.type = ".ST_SALESINVOICE." ";
    		}
-   		elseif ($_POST['filterType'] == '3')
+   		elseif ($filterType == '3')
    		{
 			$sql .= " AND trans.type = " . ST_CUSTPAYMENT;
    		}
-   		elseif ($_POST['filterType'] == '4')
+   		elseif ($filterType == '4')
    		{
 			$sql .= " AND trans.type = ".ST_CUSTCREDIT." ";
    		}
 
-    	if ($_POST['filterType'] == '2')
+    	if ($filterType == '2')
     	{
     		$today =  date2sql(Today());
     		$sql .= " AND trans.due_date < '$today'
@@ -245,12 +254,13 @@ function get_sql_for_customer_allocation_inquiry()
    	}
 
 
-   	if (!check_value('showSettled'))
+   	if (!$settled)
    	{
    		$sql .= " AND (round(abs(trans.ov_amount + trans.ov_gst + "
 		."trans.ov_freight + trans.ov_freight_tax + "
 		."trans.ov_discount) - trans.alloc,6) != 0) ";
    	}
+
    	return $sql;
 }
 
@@ -285,7 +295,7 @@ function credit_sales_invoice_allocate($invoice_no, $credit_no, $amount, $date)
 			$free += $unalloc;
 		}
 	}
-	if ($free < $amount) {
+	if (floatcmp($free, $amount)<0) {
 		// this should never happen unless sparse credit notices were allocated to 
 		// the invoice, or summarized freight costs on credit notes is more than those on invoice.
 		display_error(_("Unsuspected overallocation happened due to sparse credit notes exists for this invoice.