X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_issues_db.inc;h=28167da7da3c9b7a43354280431229af03b06b49;hb=49fa30e88e27b311edaca3ae3789d62e4629eb39;hp=a2a6a4188c47c567eca3c516527dc3a01f9dbb5d;hpb=46d3debec422c5ad5ee99c4acfe42bfa60308afb;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 a2a6a418..28167da7 100644
--- a/manufacturing/includes/db/work_order_issues_db.inc
+++ b/manufacturing/includes/db/work_order_issues_db.inc
@@ -1,11 +1,27 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 //--------------------------------------------------------------------------------------
 
 function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $workcentre,
 	$date_, $memo_)
 {
+	global $Refs;
+
 	begin_transaction();
+	$args = func_get_args();
+	$args = (object)array_combine(array('woid', 'ref', 'to_work_order', 'items', 'location', 
+		'workcentre', 'date_', 'memo_'), $args);
+	$args->trans_no = 0;
+	hook_db_prewrite($args, ST_MANUISSUE);
 
 	$details = get_work_order($woid);
 
@@ -25,12 +41,14 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 
 	// insert the actual issue
 	$sql = "INSERT INTO ".TB_PREF."wo_issues (workorder_id, reference, issue_date, loc_code, workcentre_id)
-		VALUES ($woid, ".db_quote($ref).", '" .
-		date2sql($date_) . "', ".db_quote($location).", $workcentre)";
+		VALUES (".db_escape($woid).", ".db_escape($ref).", '" .
+		date2sql($date_) . "', ".db_escape($location).", ".db_escape($workcentre).")";
 	db_query($sql,"The work order issue could not be added");
 
 	$number = db_insert_id();
 
+	$issue_total = $total_cost = 0;
+
 	foreach ($items as $item)
 	{
 
@@ -38,19 +56,37 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 			$item->quantity = -$item->quantity;
 
 		// insert a -ve stock move for each item
-		add_stock_move(28, $item->stock_id, $number,
+		add_stock_move(ST_MANUISSUE, $item->stock_id, $number,
 			$location, $date_, $memo_, -$item->quantity, 0);
 
 		$sql = "INSERT INTO ".TB_PREF."wo_issue_items (issue_id, stock_id, qty_issued)
-			VALUES ('$number', '$item->stock_id', $item->quantity)";
+			VALUES (".db_escape($number).", ".db_escape($item->stock_id).", "
+			.db_escape($item->quantity).")";
 		db_query($sql,"A work order issue item could not be added");
-	}
+
+		$standard_cost = get_standard_cost($item->stock_id);
+		$issue_cost = $standard_cost * $item->quantity;
+		$issue = get_stock_gl_code($item->stock_id);
+        $stockitem = get_item($item->stock_id);
+        $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"], 0, 0,
+                $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost);			
+		$issue_total += $issue_cost;
+	}	
+	if ($issue_total != 0)
+		add_issue_cost($details['stock_id'], $details['units_reqd'], $date_, $issue_total);
+	$issue = get_stock_gl_code($details['stock_id']);
+    $stockitem = get_item($details['stock_id']);
+    add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"],
+        0, 0, $date_.": "._("Issue to")." ".$stockitem["description"], -$total_cost);	
 
 	if ($memo_)
-		add_comments(28, $number, $date_, $memo_);
+		add_comments(ST_MANUISSUE, $number, $date_, $memo_);
 
-	references::save_last($ref, 28);
+	$Refs->save(ST_MANUISSUE, $number, $ref);
+	add_audit_trail(ST_MANUISSUE, $number, $date_);
 
+	$args->trans_no = $number;
+	hook_db_postwrite($args, ST_MANUISSUE);
 	commit_transaction();
 }
 
@@ -58,18 +94,30 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 
 function get_work_order_issues($woid)
 {
-	$sql = "SELECT * FROM ".TB_PREF."wo_issues WHERE workorder_id=$woid ORDER BY issue_no";
+	$sql = "SELECT * FROM ".TB_PREF."wo_issues WHERE workorder_id=".db_escape($woid)
+	." ORDER BY issue_no";
     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=".db_escape($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
-		FROM ".TB_PREF."wo_issues, ".TB_PREF."workorders, ".TB_PREF."stock_master, ".TB_PREF."locations, ".TB_PREF."workcentres
-		WHERE issue_no='$issue_no'
+		".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=".db_escape($issue_no)."
 		AND ".TB_PREF."workorders.id = ".TB_PREF."wo_issues.workorder_id
 		AND ".TB_PREF."locations.loc_code = ".TB_PREF."wo_issues.loc_code
 		AND ".TB_PREF."workcentres.id = ".TB_PREF."wo_issues.workcentre_id
@@ -83,9 +131,10 @@ 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
+		WHERE issue_id=".db_escape($issue_no)."
 		AND ".TB_PREF."stock_master.stock_id=".TB_PREF."wo_issue_items.stock_id
 		ORDER BY ".TB_PREF."wo_issue_items.id";
     return db_query($sql, "The work order issue items could not be retrieved");
@@ -95,7 +144,7 @@ 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";
+	$sql = "SELECT issue_no FROM ".TB_PREF."wo_issues WHERE issue_no=".db_escape($issue_no);
 	$result = db_query($sql, "Cannot retreive a wo issue");
 
     return (db_num_rows($result) > 0);
@@ -106,16 +155,18 @@ function exists_work_order_issue($issue_no)
 function void_work_order_issue($type_no)
 {
 	begin_transaction();
+	hook_db_prevoid(ST_MANUISSUE, $type_no);
 
 	// void the actual issue items and their quantities
-	$sql = "UPDATE ".TB_PREF."wo_issue_items Set qty_issued = 0 WHERE issue_id=$type_no";
+	$sql = "UPDATE ".TB_PREF."wo_issue_items Set qty_issued = 0 WHERE issue_id="
+		.db_escape($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_stock_move(ST_MANUISSUE, $type_no);
 
 	// void any related gl trans
-	void_gl_trans(28, $type_no, true);
+	void_gl_trans(ST_MANUISSUE, $type_no, true);
 
 	commit_transaction();
 }