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

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index 845253fe..2e602a6f 100644
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -17,7 +17,7 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id,
 {
 	global $Refs;
 
-	begin_transaction();
+	begin_transaction(__FUNCTION__, func_get_args());
 	$args = func_get_args();
 	$args = (object)array_combine(array('wo_ref', 'loc_code', 'units_reqd', 'stock_id',
 		'type', 'date_', 'required_by', 'memo_', 'costs', 'cr_acc', 'labour', 'cr_lab_acc'), $args);
@@ -74,7 +74,7 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id,
 function update_work_order($woid, $loc_code, $units_reqd, $stock_id,
 					$date_, $required_by, $memo_)
 {
-	begin_transaction();
+	begin_transaction(__FUNCTION__, func_get_args());
 	$args = func_get_args();
 	$args = (object)array_combine(array('woid', 'loc_code', 'units_reqd', 'stock_id',
 		'date_', 'required_by', 'memo_'), $args);
@@ -100,7 +100,7 @@ function update_work_order($woid, $loc_code, $units_reqd, $stock_id,
 
 function delete_work_order($woid, $stock_id, $qty, $date)
 {
-	begin_transaction();
+	begin_transaction(__FUNCTION__, func_get_args());
 	hook_db_prevoid(ST_WORKORDER, $woid);
 
 	// delete the work order requirements
@@ -179,7 +179,7 @@ function work_order_has_payments($woid)
 
 function release_work_order($woid, $releaseDate, $memo_)
 {
-	begin_transaction();
+	begin_transaction(__FUNCTION__, func_get_args());
 
 	$myrow = get_work_order($woid);
 	$stock_id = $myrow["stock_id"];
@@ -259,7 +259,7 @@ function reopen_work_order($woid)
 */
 function void_work_order($woid)
 {
-	begin_transaction();
+	begin_transaction(__FUNCTION__, func_get_args());
 	hook_db_prevoid(ST_WORKORDER, $woid);
 
 	$work_order = get_work_order($woid);
@@ -289,8 +289,7 @@ function void_work_order($woid)
 	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 = "
+	$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");