X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_allocation_inquiry.php;h=eb7cedc169c5da130b6f71a83dc3a06cc3207640;hb=9502b1b3fc30a8b12c647f7e024e8b8da6a50af6;hp=b0d9d51b1d71b8c258149276af5969dd4942bc3e;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index b0d9d51b..eb7cedc1 100644
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_inquiry.php
@@ -20,7 +20,7 @@ if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if ($use_date_picker)
 	$js .= get_js_date_picker();
-page(_("Supplier Allocation Inquiry"), false, false, "", $js);
+page(_($help_context = "Supplier Allocation Inquiry"), false, false, "", $js);
 
 if (isset($_GET['supplier_id']))
 {
@@ -42,7 +42,7 @@ start_form();
 if (!isset($_POST['supplier_id']))
 	$_POST['supplier_id'] = get_global_supplier();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 
 supplier_list_cells(_("Select a supplier: "), 'supplier_id', $_POST['supplier_id'], true);
@@ -60,7 +60,6 @@ set_global_supplier($_POST['supplier_id']);
 
 end_row();
 end_table();
-end_form();
 //------------------------------------------------------------------------------------------------
 function check_overdue($row)
 {
@@ -82,13 +81,13 @@ function view_link($trans)
 
 function due_date($row)
 {
-	return (($row["type"] == 20) || ($row["type"]== 21))
+	return (($row["type"] == ST_SUPPINVOICE) || ($row["type"]== ST_SUPPCREDIT))
 		? $row["due_date"] : "";
 }
 
 function fmt_balance($row)
 {
-	$value = ($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22)
+	$value = ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT)
 		? -$row["TotalAmount"] - $row["Allocated"]
 		: $row["TotalAmount"] - $row["Allocated"];
 	return $value;
@@ -101,7 +100,7 @@ function alloc_link($row)
 		"/purchasing/allocations/supplier_allocate.php?trans_no=" .
 			$row["trans_no"]. "&trans_type=" . $row["type"], ICON_MONEY );
 
-	return (($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22) 
+	return (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
 		&& (-$row["TotalAmount"] - $row["Allocated"]) > 0)
 		? $link : '';
 }
@@ -120,56 +119,7 @@ function fmt_credit($row)
 }
 //------------------------------------------------------------------------------------------------
 
- $date_after = date2sql($_POST['TransAfterDate']);
- $date_to = date2sql($_POST['TransToDate']);
-
-    // Sherifoz 22.06.03 Also get the description
-    $sql = "SELECT 
-		trans.type, 
-		trans.trans_no,
-		trans.reference, 
-		supplier.supp_name, 
-		trans.supp_reference,
-    	trans.tran_date, 
-		trans.due_date,
-		supplier.curr_code, 
-    	(trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
-		trans.alloc AS Allocated,
-		((trans.type = 20 OR trans.type = 21) AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
-    	FROM "
-			.TB_PREF."supp_trans as trans, "
-			.TB_PREF."suppliers as supplier
-    	WHERE supplier.supplier_id = trans.supplier_id
-     	AND trans.tran_date >= '$date_after'
-    	AND trans.tran_date <= '$date_to'";
-   	if ($_POST['supplier_id'] != ALL_TEXT)
-   		$sql .= " AND trans.supplier_id = '" . $_POST['supplier_id'] . "'";
-   	if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
-   	{
-   		if (($_POST['filterType'] == '1') || ($_POST['filterType'] == '2'))
-   		{
-   			$sql .= " AND trans.type = 20 ";
-   		}
-   		elseif ($_POST['filterType'] == '3')
-   		{
-			$sql .= " AND trans.type = 22 ";
-   		}
-   		elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5'))
-   		{
-			$sql .= " AND trans.type = 21 ";
-   		}
-
-   		if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5'))
-   		{
-   			$today =  date2sql(Today());
-			$sql .= " AND trans.due_date < '$today' ";
-   		}
-   	}
-
-   	if (!check_value('showSettled'))
-   	{
-   		$sql .= " AND (round(abs(ov_amount + ov_gst + ov_discount) - alloc,6) != 0) ";
-   	}
+$sql = get_sql_for_supplier_allocation_inquiry();
 
 $cols = array(
 	_("Type") => array('fun'=>'systype_name'),
@@ -196,12 +146,7 @@ if ($_POST['supplier_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 = "90%";
-start_form();
 
 display_db_pager($table);