From 9242b29b0b78487a0c5b5c9a17a7caa80aeec296 Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 28 Apr 2023 10:44:35 +0200 Subject: [PATCH] Bug 5682: Voided Invoices and PO Deliveries showing up in inquiries. Fixed. --- purchasing/inquiry/supplier_inquiry.php | 2 ++ purchasing/view/view_po.php | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index f3c3141e..c07ef3b2 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -81,6 +81,8 @@ function due_date($row) function gl_view($row) { + if ($row['type'] == ST_SUPPRECEIVE && get_voided_entry(ST_SUPPRECEIVE, $row['trans_no'])) + return set_icon(ICON_REMOVE, _("Voided.")); return get_gl_view_str($row["type"], $row["trans_no"]); } diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php index c83d12b3..ca554b5e 100644 --- a/purchasing/view/view_po.php +++ b/purchasing/view/view_po.php @@ -118,6 +118,8 @@ if (db_num_rows($grns_result) > 0) table_header($th); while ($myrow = db_fetch($grns_result)) { + if (get_voided_entry(ST_SUPPRECEIVE, $myrow['id'])) + continue; alt_table_row_color($k); label_cell(get_trans_view_str(ST_SUPPRECEIVE,$myrow["id"])); @@ -143,6 +145,8 @@ if (db_num_rows($invoice_result) > 0) table_header($th); while ($myrow = db_fetch($invoice_result)) { + if (get_voided_entry($myrow["type"],$myrow["trans_no"])) + continue; alt_table_row_color($k); label_cell(get_trans_view_str($myrow["type"],$myrow["trans_no"])); -- 2.30.2