X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_allocation_inquiry.php;h=2d08467fc142b53e58a6dfefb6d8c341b408848c;hb=f7405f00e090326b631322c77a398826ac8115d9;hp=84e5416f73e7d2cf6583c78824cddd0d0025d4bc;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index 84e5416f..2d08467f 100644
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -36,7 +36,7 @@ if (!isset($_POST['customer_id']))
 
 start_form();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 
 customer_list_cells(_("Select a customer: "), 'customer_id', $_POST['customer_id'], true);
@@ -95,7 +95,7 @@ function alloc_link($row)
 	$link = 
 	pager_link(_("Allocation"),
 		"/sales/allocations/customer_allocate.php?trans_no=" . $row["trans_no"] 
-		."&trans_type=" . $row["type"], ICON_MONEY);
+		."&trans_type=" . $row["type"]."&debtor_no=" . $row["debtor_no"], ICON_ALLOC);
 
 	if ($row["type"] == ST_CUSTCREDIT && $row['TotalAmount'] > 0)
 	{
@@ -103,16 +103,19 @@ function alloc_link($row)
 		return $link;
 	}
 	elseif (($row["type"] == ST_CUSTPAYMENT || $row["type"] == ST_BANKDEPOSIT) &&
-		($row['TotalAmount'] - $row['Allocated']) > 0)
+		(floatcmp($row['TotalAmount'], $row['Allocated']) >= 0))
 	{
 		/*its a receipt  which could have an allocation*/
 		return $link;
 	}
-	elseif ($row["type"] == ST_CUSTPAYMENT && $row['TotalAmount'] < 0)
+	elseif ($row["type"] == ST_CUSTPAYMENT && $row['TotalAmount'] <= 0)
 	{
 		/*its a negative receipt */
 		return '';
-	}
+	} elseif ($row["type"] == ST_SALESINVOICE && ($row['TotalAmount'] - $row['Allocated']) > 0)
+		return pager_link(_("Payment"),
+			"/sales/customer_payments.php?customer_id=".$row["debtor_no"]."&SInvoice=" . $row["trans_no"], ICON_MONEY);
+
 }
 
 function fmt_debit($row)
@@ -133,80 +136,18 @@ function fmt_credit($row)
 }
 //------------------------------------------------------------------------------------------------
 
-  $data_after = date2sql($_POST['TransAfterDate']);
-  $date_to = date2sql($_POST['TransToDate']);
-
-  $sql = "SELECT 
-  		trans.type,
-		trans.trans_no,
-		trans.reference,
-		trans.order_,
-		trans.tran_date,
-		trans.due_date,
-		debtor.name,
-		debtor.curr_code,
-    	(trans.ov_amount + trans.ov_gst + trans.ov_freight 
-			+ 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
-    	FROM "
-			.TB_PREF."debtor_trans as trans, "
-			.TB_PREF."debtors_master as debtor
-    	WHERE debtor.debtor_no = trans.debtor_no
-			AND (trans.ov_amount + trans.ov_gst + trans.ov_freight 
-				+ trans.ov_freight_tax + trans.ov_discount != 0)
-    		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 (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
-   	{
-   		if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2')
-   		{
-   			$sql .= " AND trans.type = ".ST_SALESINVOICE." ";
-   		}
-   		elseif ($_POST['filterType'] == '3')
-   		{
-			$sql .= " AND trans.type = " . ST_CUSTPAYMENT;
-   		}
-   		elseif ($_POST['filterType'] == '4')
-   		{
-			$sql .= " AND trans.type = ".ST_CUSTCREDIT." ";
-   		}
-
-    	if ($_POST['filterType'] == '2')
-    	{
-    		$today =  date2sql(Today());
-    		$sql .= " AND trans.due_date < '$today'
-				AND (round(abs(trans.ov_amount + "
-				."trans.ov_gst + trans.ov_freight + "
-				."trans.ov_freight_tax + trans.ov_discount) - trans.alloc,6) > 0) ";
-    	}
-   	}else
-   	{
-	    $sql .= " AND trans.type <> ".ST_CUSTDELIVERY." ";
-   	}
-
-
-   	if (!check_value('showSettled'))
-   	{
-   		$sql .= " AND (round(abs(trans.ov_amount + trans.ov_gst + "
-		."trans.ov_freight + trans.ov_freight_tax + "
-		."trans.ov_discount) - trans.alloc,6) != 0) ";
-   	}
-//------------------------------------------------------------------------------------------------
+$sql = get_sql_for_customer_allocation_inquiry(get_post('TransAfterDate'), get_post('TransToDate'),
+		get_post('customer_id'), get_post('filterType'), check_value('showSettled'));
 
+//------------------------------------------------------------------------------------------------
 $cols = array(
 	_("Type") => array('fun'=>'systype_name'),
 	_("#") => array('fun'=>'view_link'),
 	_("Reference"), 
-	_("Order") => array('fun'=>'order_link'), 
+	_("Order") => array('fun'=>'order_link', 'ord'=>''), 
 	_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
 	_("Due Date") => array('type'=>'date', 'fun'=>'due_date'),
-	_("Customer"), 
+	_("Customer") => array('name' =>'name',  'ord'=>'asc'), 
 	_("Currency") => array('align'=>'center'),
 	_("Debit") => array('align'=>'right','fun'=>'fmt_debit'), 
 	_("Credit") => array('align'=>'right','insert'=>true, 'fun'=>'fmt_credit'),