X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_produce_items_db.inc;h=9b2095c076141fdce58e949a8ab2c5ed1999d4d7;hb=49fa30e88e27b311edaca3ae3789d62e4629eb39;hp=a6233050d455e965c3096551d0141cd0db3e6a68;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git

diff --git a/manufacturing/includes/db/work_order_produce_items_db.inc b/manufacturing/includes/db/work_order_produce_items_db.inc
index a6233050..9b2095c0 100644
--- a/manufacturing/includes/db/work_order_produce_items_db.inc
+++ b/manufacturing/includes/db/work_order_produce_items_db.inc
@@ -14,6 +14,11 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
 	global $Refs;
 
 	begin_transaction();
+	$args = func_get_args();
+	$args = (object)array_combine(array('woid', 'ref', 'quantity', 'date_', 'memo_','close_wo'),
+		$args);
+	$args->trans_no = 0;
+	hook_db_prewrite($args, ST_MANURECEIVE);
 
 	$details = get_work_order($woid);
 
@@ -33,7 +38,8 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
     $date = date2sql($date_);
 
     $sql = "INSERT INTO ".TB_PREF."wo_manufacture (workorder_id, reference, quantity, date_)
-		VALUES ($woid, ".db_escape($ref).", $quantity, '$date')";
+		VALUES (".db_escape($woid).", ".db_escape($ref).", ".db_escape($quantity)
+		.", '$date')";
 
 	db_query($sql,"A work order manufacture could not be added");
 
@@ -41,13 +47,13 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
 
 	// -------------------------------------------------------------------------
 
-	work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, true);
+	work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, $id);
 
 	// -------------------------------------------------------------------------
 	// insert a +ve stock move for the item being manufactured
 	// negative means "unproduce" or unassemble
 	add_stock_move(ST_MANURECEIVE, $details["stock_id"], $id,
-		$details["loc_code"], $date_, $memo_, $quantity, 0);
+		$details["loc_code"], $date_, $ref, $quantity, 0);
 	// update wo quantity and close wo if requested
 	work_order_update_finished_quantity($woid, $quantity, $close_wo);
 
@@ -58,6 +64,8 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
 	$Refs->save(ST_MANURECEIVE, $id, $ref);
 	add_audit_trail(ST_MANURECEIVE, $id, $date_, _("Production."));
 
+	$args->trans_no = $id;
+	hook_db_postwrite($args, ST_MANURECEIVE);
 	commit_transaction();
 }
 
@@ -65,11 +73,12 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
 
 function get_work_order_produce($id)
 {
-	$sql = "SELECT ".TB_PREF."wo_manufacture.*,".TB_PREF."workorders.stock_id, ".TB_PREF."stock_master.description AS StockDescription
+	$sql = "SELECT ".TB_PREF."wo_manufacture.*,".TB_PREF."workorders.stock_id, "
+		.TB_PREF."stock_master.description AS StockDescription
 		FROM ".TB_PREF."wo_manufacture, ".TB_PREF."workorders, ".TB_PREF."stock_master
 		WHERE ".TB_PREF."wo_manufacture.workorder_id=".TB_PREF."workorders.id
 		AND ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id
-		AND ".TB_PREF."wo_manufacture.id=$id";
+		AND ".TB_PREF."wo_manufacture.id=".db_escape($id);
     $result = db_query($sql, "The work order production could not be retrieved");
 
     return db_fetch($result);
@@ -79,7 +88,8 @@ function get_work_order_produce($id)
 
 function get_work_order_productions($woid)
 {
-	$sql = "SELECT * FROM ".TB_PREF."wo_manufacture WHERE workorder_id=$woid ORDER BY id";
+	$sql = "SELECT * FROM ".TB_PREF."wo_manufacture WHERE workorder_id="
+		.db_escape($woid)." ORDER BY id";
     return db_query($sql, "The work order issues could not be retrieved");
 }
 
@@ -87,7 +97,7 @@ function get_work_order_productions($woid)
 
 function exists_work_order_produce($id)
 {
-	$sql = "SELECT id FROM ".TB_PREF."wo_manufacture WHERE id=$id";
+	$sql = "SELECT id FROM ".TB_PREF."wo_manufacture WHERE id=".db_escape($id);
 	$result = db_query($sql, "Cannot retreive a wo production");
 
     return (db_num_rows($result) > 0);
@@ -98,14 +108,17 @@ function exists_work_order_produce($id)
 function void_work_order_produce($type_no)
 {
 	begin_transaction();
+	hook_db_prevoid(ST_MANURECEIVE, $type_no);
 
 	$row = get_work_order_produce($type_no);
 
 	// deduct the quantity of this production from the parent work order
 	work_order_update_finished_quantity($row["workorder_id"], -$row["quantity"]);
 
+	work_order_quick_costs($row['workorder_id'], $row['stock_id'], -$row['quantity'], sql2date($row['date_']), $type_no);
+
 	// clear the production record
-	$sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=$type_no";
+	$sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".db_escape($type_no);
 	db_query($sql, "Cannot void a wo production");
 
 	// void all related stock moves