X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_issues_db.inc;h=b78bb080433591a7cebdd57481ff80acc549cc7f;hb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;hp=fcc6d6f5a6936aac110e13fea9c9991889be5d7d;hpb=3b44e46890718e86766a9090bac21cde04d5a0e2;p=fa-stable.git

diff --git a/manufacturing/includes/db/work_order_issues_db.inc b/manufacturing/includes/db/work_order_issues_db.inc
index fcc6d6f5..b78bb080 100644
--- a/manufacturing/includes/db/work_order_issues_db.inc
+++ b/manufacturing/includes/db/work_order_issues_db.inc
@@ -2,57 +2,55 @@
 
 //--------------------------------------------------------------------------------------
 
-function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $workcentre, 
+function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $workcentre,
 	$date_, $memo_)
 {
 	begin_transaction();
 
 	$details = get_work_order($woid);
-    
-    if (strlen($details[0]) == 0) 
+
+    if (strlen($details[0]) == 0)
     {
     	echo _("The order number sent is not valid.");
     	cancel_transaction();
     	exit;
     }
-    
-	if (work_order_is_closed($woid)) 
+
+	if (work_order_is_closed($woid))
 	{
 		display_error("UNEXPECTED : Issuing items for a closed Work Order");
 		cancel_transaction();
 		exit;
-	}    	
-    
+	}
+
 	// insert the actual issue
-	$sql = "INSERT INTO ".TB_PREF."wo_issues (workorder_id, reference, issue_date, loc_code, workcentre_id) 
-		VALUES ($woid, '$ref', '" .
-		date2sql($date_) . "', '$location', $workcentre)";
+	$sql = "INSERT INTO ".TB_PREF."wo_issues (workorder_id, reference, issue_date, loc_code, workcentre_id)
+		VALUES ($woid, ".db_escape($ref).", '" .
+		date2sql($date_) . "', ".db_escape($location).", $workcentre)";
 	db_query($sql,"The work order issue could not be added");
-	
+
 	$number = db_insert_id();
-	
-	foreach ($items as $item) 
+
+	foreach ($items as $item)
 	{
-		
+
 		if ($to_work_order)
 			$item->quantity = -$item->quantity;
 
 		// insert a -ve stock move for each item
-		add_stock_move(28, $item->stock_id, $number, 
+		add_stock_move(28, $item->stock_id, $number,
 			$location, $date_, $memo_, -$item->quantity, 0);
-									
-		$sql = "INSERT INTO ".TB_PREF."wo_issue_items (issue_id, stock_id, qty_issued) 
+
+		$sql = "INSERT INTO ".TB_PREF."wo_issue_items (issue_id, stock_id, qty_issued)
 			VALUES ('$number', '$item->stock_id', $item->quantity)";
 		db_query($sql,"A work order issue item could not be added");
 	}
-	
+
 	if ($memo_)
-		add_comments(28, $number, $date_, $memo_);	
-	
-	add_forms_for_sys_type(28, $number, $to_work_order, $location);
-	
+		add_comments(28, $number, $date_, $memo_);
+
 	references::save_last($ref, 28);
-	
+
 	commit_transaction();
 }
 
@@ -64,12 +62,20 @@ function get_work_order_issues($woid)
     return db_query($sql, "The work order issues could not be retrieved");
 }
 
+function get_additional_issues($woid)
+{
+	$sql = "SELECT ".TB_PREF."wo_issues.*, ".TB_PREF."wo_issue_items.*
+		FROM ".TB_PREF."wo_issues, ".TB_PREF."wo_issue_items
+		WHERE ".TB_PREF."wo_issues.issue_no=".TB_PREF."wo_issue_items.issue_id
+		AND ".TB_PREF."wo_issues.workorder_id=$woid ORDER BY ".TB_PREF."wo_issue_items.id";
+    return db_query($sql, "The work order issues could not be retrieved");
+}
 //--------------------------------------------------------------------------------------
 
 function get_work_order_issue($issue_no)
 {
-	$sql = "SELECT DISTINCT ".TB_PREF."wo_issues.*, ".TB_PREF."workorders.stock_id, 
-		".TB_PREF."stock_master.description, ".TB_PREF."locations.location_name, ".TB_PREF."workcentres.name AS WorkCentreName 
+	$sql = "SELECT DISTINCT ".TB_PREF."wo_issues.*, ".TB_PREF."workorders.stock_id,
+		".TB_PREF."stock_master.description, ".TB_PREF."locations.location_name, ".TB_PREF."workcentres.name AS WorkCentreName
 		FROM ".TB_PREF."wo_issues, ".TB_PREF."workorders, ".TB_PREF."stock_master, ".TB_PREF."locations, ".TB_PREF."workcentres
 		WHERE issue_no='$issue_no'
 		AND ".TB_PREF."workorders.id = ".TB_PREF."wo_issues.workorder_id
@@ -77,7 +83,7 @@ function get_work_order_issue($issue_no)
 		AND ".TB_PREF."workcentres.id = ".TB_PREF."wo_issues.workcentre_id
 		AND ".TB_PREF."stock_master.stock_id = ".TB_PREF."workorders.stock_id";
     $result = db_query($sql, "A work order issue could not be retrieved");
-    
+
     return db_fetch($result);
 }
 
@@ -85,7 +91,7 @@ function get_work_order_issue($issue_no)
 
 function get_work_order_issue_details($issue_no)
 {
-	$sql = "SELECT ".TB_PREF."wo_issue_items.*,".TB_PREF."stock_master.description, ".TB_PREF."stock_master.units 
+	$sql = "SELECT ".TB_PREF."wo_issue_items.*,".TB_PREF."stock_master.description, ".TB_PREF."stock_master.units
 		FROM ".TB_PREF."wo_issue_items, ".TB_PREF."stock_master
 		WHERE issue_id=$issue_no
 		AND ".TB_PREF."stock_master.stock_id=".TB_PREF."wo_issue_items.stock_id
@@ -98,27 +104,27 @@ function get_work_order_issue_details($issue_no)
 function exists_work_order_issue($issue_no)
 {
 	$sql = "SELECT issue_no FROM ".TB_PREF."wo_issues WHERE issue_no=$issue_no";
-	$result = db_query($sql, "Cannot retreive a wo issue");	
-	
-    return (db_num_rows($result) > 0);				
-}	 	
+	$result = db_query($sql, "Cannot retreive a wo issue");
+
+    return (db_num_rows($result) > 0);
+}
 
 //--------------------------------------------------------------------------------------
 
 function void_work_order_issue($type_no)
 {
 	begin_transaction();
-	
+
 	// void the actual issue items and their quantities
 	$sql = "UPDATE ".TB_PREF."wo_issue_items Set qty_issued = 0 WHERE issue_id=$type_no";
 	db_query($sql,"A work order issue item could not be voided");
-		
+
 	// void all related stock moves
 	void_stock_move(28, $type_no);
-	
+
 	// void any related gl trans
-	void_gl_trans(28, $type_no, true);    	
-	
+	void_gl_trans(28, $type_no, true);
+
 	commit_transaction();
 }