X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_allocation_inquiry.php;h=f32bd6cbb2c4212b1ef41d81aa7db91bd05fb84f;hb=23936f0bdf11736bff72d90513846cf94def317e;hp=51749f2cc1c50c7d70df628e167b1683c15f72af;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index 51749f2c..f32bd6cb 100644
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -22,7 +22,7 @@ if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if ($use_date_picker)
 	$js .= get_js_date_picker();
-page(_("Customer Allocation Inquiry"), false, false, "", $js);
+page(_($help_context = "Customer Allocation Inquiry"), false, false, "", $js);
 
 if (isset($_GET['customer_id']))
 {
@@ -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);
@@ -54,7 +54,6 @@ set_global_customer($_POST['customer_id']);
 
 end_row();
 end_table();
-end_form();
 //------------------------------------------------------------------------------------------------
 function check_overdue($row)
 {
@@ -98,7 +97,7 @@ function alloc_link($row)
 		"/sales/allocations/customer_allocate.php?trans_no=" . $row["trans_no"] 
 		."&trans_type=" . $row["type"], ICON_MONEY);
 
-	if ($row["type"] == 11 && $row['TotalAmount'] > 0)
+	if ($row["type"] == ST_CUSTCREDIT && $row['TotalAmount'] > 0)
 	{
 		/*its a credit note which could have an allocation */
 		return $link;
@@ -119,7 +118,7 @@ function alloc_link($row)
 function fmt_debit($row)
 {
 	$value =
-	    $row['type']==11 || $row['type']==12 || $row['type']==2 ?
+	    $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ?
 		-$row["TotalAmount"] : $row["TotalAmount"];
 	return $value>=0 ? price_format($value) : '';
 
@@ -128,76 +127,14 @@ function fmt_debit($row)
 function fmt_credit($row)
 {
 	$value =
-	    !($row['type']==11 || $row['type']==12 || $row['type']==2) ?
+	    !($row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT) ?
 		-$row["TotalAmount"] : $row["TotalAmount"];
 	return $value>0 ? price_format($value) : '';
 }
 //------------------------------------------------------------------------------------------------
 
-  $data_after = date2sql($_POST['TransAfterDate']);
-  $date_to = date2sql($_POST['TransToDate']);
-
-  $sql = "SELECT 
-  		trans.type,
-		trans.order_,
-		trans.trans_no,
-		trans.reference,
-		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 = 10)
-			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 = '" . $_POST['customer_id'] . "'";
-
-   	if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
-   	{
-   		if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2')
-   		{
-   			$sql .= " AND trans.type = 10 ";
-   		}
-   		elseif ($_POST['filterType'] == '3')
-   		{
-			$sql .= " AND trans.type = " . ST_CUSTPAYMENT;
-   		}
-   		elseif ($_POST['filterType'] == '4')
-   		{
-			$sql .= " AND trans.type = 11 ";
-   		}
-
-    	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 != 13 ";
-   	}
-
-
-   	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();
+
 //------------------------------------------------------------------------------------------------
 
 $cols = array(
@@ -224,12 +161,7 @@ if ($_POST['customer_id'] != ALL_TEXT) {
 $table =& new_db_pager('doc_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
-if (get_post('RefreshInquiry')) {
-	$table->set_sql($sql);
-	$table->set_columns($cols);
-}
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);