X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_produce_items_db.inc;h=b9fd16f0e9198ad61d94b74a281e21b4aebc84b8;hb=467fca01c62dd47bcd97ec957a49b0209732c9d0;hp=6676549cafa82f62717bc17b686a7848ed6fe3df;hpb=2383d33373d6ddec06906658a0ed6398077c1147;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 6676549c..b9fd16f0 100644
--- a/manufacturing/includes/db/work_order_produce_items_db.inc
+++ b/manufacturing/includes/db/work_order_produce_items_db.inc
@@ -11,6 +11,8 @@
 ***********************************************************************/
 function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
 {
+	global $Refs;
+
 	begin_transaction();
 
 	$details = get_work_order($woid);
@@ -31,7 +33,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");
 
@@ -39,22 +42,22 @@ 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(29, $details["stock_id"], $id,
+	add_stock_move(ST_MANURECEIVE, $details["stock_id"], $id,
 		$details["loc_code"], $date_, $memo_, $quantity, 0);
 	// update wo quantity and close wo if requested
 	work_order_update_finished_quantity($woid, $quantity, $close_wo);
 
 
 	if ($memo_)
-		add_comments(29, $id, $date_, $memo_);
+		add_comments(ST_MANURECEIVE, $id, $date_, $memo_);
 
-	references::save(29, $id, $ref);
-	add_audit_trail(29, $id, $date_, _("Production."));
+	$Refs->save(ST_MANURECEIVE, $id, $ref);
+	add_audit_trail(ST_MANURECEIVE, $id, $date_, _("Production."));
 
 	commit_transaction();
 }
@@ -63,11 +66,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);
@@ -77,7 +81,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");
 }
 
@@ -85,7 +90,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);
@@ -102,15 +107,17 @@ function void_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
-	void_stock_move(29, $type_no);
+	void_stock_move(ST_MANURECEIVE, $type_no);
 
 	// void any related gl trans
-	void_gl_trans(29, $type_no, true);
+	void_gl_trans(ST_MANURECEIVE, $type_no, true);
 
 	commit_transaction();
 }