4869: Work order listing and print work orders reports should omit voided orders...

[fa-stable.git] / manufacturing / includes / db / work_orders_db.inc

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index 5c7210e5b8572cd5fa6c97a09cb698b12d3b561b..845253fe0fb7fb2626186937097281030218e220 100644 (file)
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -122,19 +122,21 @@ 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";
 
-       $result = db_query($sql, "The work order issues could not be retrieved");
+       $result = db_query($sql, "The work order could not be retrieved");
 
        if (!$allow_null && db_num_rows($result) == 0)
        {
-               display_db_error("Could not find work order $woid", $sql);
+               display_db_error("Could not find work order ".(int)$woid, $sql);
                return false;
        }