X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=e1b0329edf34e1629ff8692b1a524c1c9ed8a12b;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;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..e1b0329e 100644
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -247,6 +247,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 +272,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 +286,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();
 }