X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=845253fe0fb7fb2626186937097281030218e220;hb=fe984d19a32486bb72c6489fab3bd26a2dd3b3f2;hp=05ddbb6b4075247e1c7cee399f015ec0c8aac3d3;hpb=8b9cba025d8d4a14d40d3d49f4e40cd5faf14c0a;p=fa-stable.git

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";