X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_allocation_inquiry.php;h=84fb2e12a9d3b2ca1d50ad6f8433dfc5b4e36792;hb=bd8f517d30d1edd3261e26e582ddd9e11c555616;hp=6998b74fce50d535f82dbd650be28a2f0da41608;hpb=264c09696d65efe4532c197f317162daf8c24f32;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index 6998b74f..84fb2e12 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);
 
@@ -47,7 +47,7 @@ start_row();
 
 supplier_list_cells(_("Select a supplier: "), 'supplier_id', $_POST['supplier_id'], true);
 
-date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
+date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
 date_cells(_("To:"), 'TransToDate', '', null, 1);
 
 supp_allocations_list_cell("filterType", null);
@@ -95,14 +95,15 @@ function fmt_balance($row)
 
 function alloc_link($row)
 {
-	$link = 
-	pager_link(_("Allocations"),
-		"/purchasing/allocations/supplier_allocate.php?trans_no=" .
-			$row["trans_no"]. "&trans_type=" . $row["type"], ICON_MONEY );
-
-	return (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
-		&& (-$row["TotalAmount"] - $row["Allocated"]) > 0)
-		? $link : '';
+	if (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
+		&& (-$row["TotalAmount"] - $row["Allocated"]) >= 0)
+			return 	pager_link(_("Allocations"), "/purchasing/allocations/supplier_allocate.php?trans_no=" .
+				$row["trans_no"]. "&trans_type=" . $row["type"]. "&supplier_id=" . $row["supplier_id"], ICON_ALLOC);
+	elseif ($row["type"] == ST_SUPPINVOICE && ($row["TotalAmount"] - $row["Allocated"]) > 0)
+			return 	pager_link(_("Pay"), "/purchasing/supplier_payment.php?supplier_id=".$row["supplier_id"]
+				."&PInvoice=".$row["trans_no"], ICON_MONEY );
+	else
+		return '';
 }
 
 function fmt_debit($row)
@@ -119,7 +120,8 @@ function fmt_credit($row)
 }
 //------------------------------------------------------------------------------------------------
 
-$sql = get_sql_for_supplier_allocation_inquiry();
+$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'),
@@ -152,4 +154,3 @@ display_db_pager($table);
 
 end_form();
 end_page();
-?>