X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_allocation_inquiry.php;h=40a9ffd88ee1c2c161b365553260eec6b3e9afbb;hb=57f7d4930f7c579c85272d88eddd9a5bede8ef19;hp=850dfc3081c344003cd61d7f7701aad1af71eaf3;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index 850dfc30..40a9ffd8 100644
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_inquiry.php
@@ -16,9 +16,9 @@ include($path_to_root . "/includes/session.inc");
 
 include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 page(_($help_context = "Supplier Allocation Inquiry"), false, false, "", $js);
 
@@ -42,12 +42,12 @@ 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);
 
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
+date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
 date_cells(_("To:"), 'TransToDate', '', null, 1);
 
 supp_allocations_list_cell("filterType", null);
@@ -87,9 +87,9 @@ function due_date($row)
 
 function fmt_balance($row)
 {
-	$value = ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT)
-		? -$row["TotalAmount"] - $row["Allocated"]
-		: $row["TotalAmount"] - $row["Allocated"];
+	$value = ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT)	? -$row["TotalAmount"] - $row["Allocated"]
+		: ($row["type"] == ST_JOURNAL ? abs($row["TotalAmount"]) - $row["Allocated"] :
+			$row["TotalAmount"] - $row["Allocated"]);
 	return $value;
 }
 
@@ -98,11 +98,21 @@ function alloc_link($row)
 	$link = 
 	pager_link(_("Allocations"),
 		"/purchasing/allocations/supplier_allocate.php?trans_no=" .
-			$row["trans_no"]. "&trans_type=" . $row["type"], ICON_MONEY );
+			$row["trans_no"]. "&trans_type=" . $row["type"]. "&supplier_id=" . $row["supplier_id"], ICON_ALLOC );
+
+	if ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPAYMENT ||
+		(($row["type"] == ST_SUPPCREDIT || $row["type"] == ST_JOURNAL) && $row["TotalAmount"] < 0))
+		return floatcmp(-$row["TotalAmount"], $row["Allocated"]) ? $link : '';
+
+	$link = 
+	pager_link(_("Payment"),
+		"/purchasing/supplier_payment.php?supplier_id=".$row["supplier_id"]."&PInvoice=" 
+			. $row["trans_no"]."&trans_type=" . $row["type"], ICON_MONEY);
+
+	if ($row["type"] == ST_SUPPINVOICE || (($row["type"] == ST_SUPPCREDIT || $row["type"] == ST_JOURNAL) && $row["TotalAmount"] > 0))
+		return floatcmp($row["TotalAmount"], $row["Allocated"]) ? $link : '';
+
 
-	return (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
-		&& (-$row["TotalAmount"] - $row["Allocated"]) > 0)
-		? $link : '';
 }
 
 function fmt_debit($row)
@@ -119,66 +129,17 @@ 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 = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") 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 = ".db_escape($_POST['supplier_id']);
-   	if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
-   	{
-   		if (($_POST['filterType'] == '1') || ($_POST['filterType'] == '2'))
-   		{
-   			$sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
-   		}
-   		elseif ($_POST['filterType'] == '3')
-   		{
-			$sql .= " AND trans.type = ".ST_SUPPAYMENT." ";
-   		}
-   		elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5'))
-   		{
-			$sql .= " AND trans.type = ".ST_SUPPCREDIT." ";
-   		}
-
-   		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(get_post('TransAfterDate'),get_post('TransToDate'),
+	get_post('filterType'), get_post('supplier_id'), check_value('showSettled'));
 
 $cols = array(
 	_("Type") => array('fun'=>'systype_name'),
-	_("#") => array('fun'=>'view_link', 'ord'=>''),
+	_("#") => array('fun'=>'view_link', 'ord'=>'', 'align'=>'right'),
 	_("Reference"), 
 	_("Supplier") => array('ord'=>''), 
 	_("Supp Reference"),
 	_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
-	_("Due Date") => array('fun'=>'due_date'),
+	_("Due Date") => array('type'=>'date', 'fun'=>'due_date'),
 	_("Currency") => array('align'=>'center'),
 	_("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), 
 	_("Credit") => array('align'=>'right', 'insert'=>true, 'fun'=>'fmt_credit'), 
@@ -202,4 +163,3 @@ display_db_pager($table);
 
 end_form();
 end_page();
-?>