X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_allocation_inquiry.php;h=40a9ffd88ee1c2c161b365553260eec6b3e9afbb;hb=630e99edecc3eabe708a9e7bda94eaa60bf16db7;hp=17bf983bf87247d39273b2a18d651e14f5bcf202;hpb=2bbf52478cf6cbf4fb89395f18390f1a6af93f40;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index 17bf983b..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);
 
@@ -47,7 +47,7 @@ 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,23 +87,32 @@ 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;
 }
 
 function alloc_link($row)
 {
-	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"], ICON_MONEY );
-	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 '';
+	$link = 
+	pager_link(_("Allocations"),
+		"/purchasing/allocations/supplier_allocate.php?trans_no=" .
+			$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 : '';
+
+
 }
 
 function fmt_debit($row)
@@ -120,16 +129,17 @@ 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'),
-	_("#") => 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'), 
@@ -153,4 +163,3 @@ display_db_pager($table);
 
 end_form();
 end_page();
-?>