[0004212] Work Order Entry: fixed error when voided WO refence is reused.

[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 f1f696136cf7776839d744dc864d74dfcfd515da..e1b0329edf34e1629ff8692b1a524c1c9ed8a12b 100644 (file)
--- 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();
 }