X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=845253fe0fb7fb2626186937097281030218e220;hb=d907208297556310cc7c51fcb9086869c880ab2d;hp=f1f696136cf7776839d744dc864d74dfcfd515da;hpb=6318d776679a05048e10617674e6b9a13b55062d;p=fa-stable.git

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index f1f69613..845253fe 100644
--- 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;
 	}
 
@@ -247,6 +249,7 @@ function reopen_work_order($woid)
 
 		$sql = "UPDATE ".TB_PREF."workorders SET closed=0 WHERE id = "
 			.db_escape($woid);
+
 		db_query($sql, "The work order couldn't be reopened");
 }
 
@@ -271,11 +274,6 @@ function void_work_order($woid)
 			void_work_order_produce($prod['id']);
 	}
 
-	// close workorder
-	$sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = "
-		.db_escape($woid);
-	db_query($sql, "The work order couldn't be voided");
-
 	// void addtional material issues
 	$issues = get_work_order_issues($woid);
 	while($issue = db_fetch($issues))
@@ -290,6 +288,12 @@ function void_work_order($woid)
 	// clear the requirements units received
 	void_wo_requirements($woid);
 
+	// close workorder
+	// FIXME: due to bug in 2.4 db scheme (conflicting wo_ref unique key) we have to fix wo_ref here:
+	$sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0, wo_ref=CONCAT(wo_ref, ' ', '".uniqid()."') WHERE id = "
+		.db_escape($woid);
+	db_query($sql, "The work order couldn't be voided");
+
 	commit_transaction();
 }
 
@@ -310,11 +314,13 @@ function get_sql_for_work_orders($outstanding_only, $stock_id, $location = ALL_T
 		workorder.released,
 		workorder.stock_id,
 		unit.decimals
-		FROM ".TB_PREF."workorders as workorder,"
+		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."item_units as unit,"
 			.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
 			AND item.units=unit.abbr";