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);
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);
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;
}
$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)
}
//------------------------------------------------------------------------------------------------
-$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'),
end_form();
end_page();
-?>