From 3bd9d76da0a8c8f014f83fc5203b9954b66737ab Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 26 Mar 2019 10:42:35 +0100 Subject: [PATCH] 4869: Work order listing and print work orders reports should omit voided orders. @Braath Waate fixed. --- manufacturing/includes/db/work_orders_db.inc | 6 ++++-- reporting/includes/reports_classes.inc | 2 ++ reporting/rep402.php | 8 +++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index 05ddbb6b..845253fe 100644 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@ -122,10 +122,12 @@ function get_work_order($woid, $allow_null=false) { $sql = "SELECT wo.*,st.description As StockItemName,l.location_name, l.delivery_address,l.email, l.contact, st.inventory_account, st.wip_account - FROM ".TB_PREF."workorders wo, " + FROM ".TB_PREF."workorders wo + LEFT JOIN ".TB_PREF."voided v ON v.id=wo.id and v.type=".ST_WORKORDER."," .TB_PREF."stock_master st, " .TB_PREF."locations l - WHERE st.stock_id=wo.stock_id + WHERE ISNULL(v.id) + AND st.stock_id=wo.stock_id AND l.loc_code=wo.loc_code AND wo.id=".db_escape($woid)." GROUP BY wo.id"; diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc index 77399c3f..1ad826e4 100644 --- a/reporting/includes/reports_classes.inc +++ b/reporting/includes/reports_classes.inc @@ -410,6 +410,8 @@ class BoxReports FROM ".TB_PREF."stock_master item," .TB_PREF."workorders wo LEFT JOIN ".TB_PREF."voided v ON wo.id=v.id and v.type=".ST_WORKORDER." + WHERE ISNULL(v.id) + AND item.stock_id=wo.stock_id WHERE item.stock_id=wo.stock_id ORDER BY wo.id DESC"; return combo_input($name, '', $sql, 'id', 'IName',array('order'=>false)); diff --git a/reporting/rep402.php b/reporting/rep402.php index 447a7305..5cbb6994 100644 --- a/reporting/rep402.php +++ b/reporting/rep402.php @@ -43,10 +43,12 @@ function getTransactions($items, $open_only, $location) workorder.required_by, workorder.closed, workorder.stock_id - FROM ".TB_PREF."workorders as workorder," - .TB_PREF."stock_master as item," + FROM ".TB_PREF."workorders as workorder + LEFT JOIN ".TB_PREF."voided v ON v.id=workorder.id and v.type=".ST_WORKORDER."," + .TB_PREF."stock_master as item," .TB_PREF."locations as location - WHERE workorder.stock_id=item.stock_id + WHERE ISNULL(v.id) + AND workorder.stock_id=item.stock_id AND workorder.loc_code=location.loc_code"; if ($open_only != 0) -- 2.30.2