X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_issues_db.inc;h=422e0019beea4f0959ee1d045d89ad2ab3d16e82;hb=8fc62e7db7194f4bb1af3377504777013f51f70a;hp=8b7f7f7db36c82d2ef12b505807a5f3b295743b9;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;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 8b7f7f7d..422e0019 100644
--- a/manufacturing/includes/db/work_order_issues_db.inc
+++ b/manufacturing/includes/db/work_order_issues_db.inc
@@ -23,23 +23,6 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 	$args->trans_no = 0;
 	hook_db_prewrite($args, ST_MANUISSUE);
 
-	$details = get_work_order($woid);
-
-    if (strlen($details[0]) == 0)
-    {
-    	echo _("The order number sent is not valid.");
-    	cancel_transaction();
-    	exit;
-    }
-
-	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 (".db_escape($woid).", ".db_escape($ref).", '" .
 		date2sql($date_) . "', ".db_escape($location).", ".db_escape($workcentre).")";
@@ -49,45 +32,46 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 
 	$issue_total = $total_cost = 0;
 
+	$wo = get_work_order($woid);
+
 	foreach ($items as $item)
 	{
-
-		if ($to_work_order)
+		if ($to_work_order)	// otherwise it is material return to inventory
 			$item->quantity = -$item->quantity;
 
-		//Chaitanya: Stamp the standard_cost
-		$standard_cost = get_standard_cost($item->stock_id);
+		$unit_cost = get_unit_cost($item->stock_id);
 		// insert a -ve stock move for each item
 		add_stock_move(ST_MANUISSUE, $item->stock_id, $number,
-			$location, $date_, $memo_, -$item->quantity, $standard_cost);
+			$location, $date_, $memo_, -$item->quantity, $unit_cost);
+
+		$sql = "INSERT INTO ".TB_PREF."wo_issue_items (issue_id, stock_id, qty_issued, unit_cost)
+			SELECT ".db_escape($number).",".db_escape($item->stock_id).",".db_escape($item->quantity).", material_cost
+			FROM ".TB_PREF."stock_master
+			WHERE stock_id=".db_escape($item->stock_id);
 
-		$sql = "INSERT INTO ".TB_PREF."wo_issue_items (issue_id, stock_id, qty_issued)
-			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);
+		$unit_cost = get_unit_cost($item->stock_id);
+		$issue_cost = $unit_cost * $item->quantity;
+
         $stockitem = get_item($item->stock_id);
 
-		//Chaitanya : Compatibility for Service Items
-		if (!is_service($issue["mb_flag"]))
-			$ivaccount = $issue["inventory_account"];
+		// Compatibility for Service Items
+		if (!is_service($stockitem["mb_flag"]))
+			$ivaccount = $stockitem["inventory_account"];
 		else
-			$ivaccount = $issue["cogs_account"];		
-
-        $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
-                $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost);			
-		$issue_total += $issue_cost;
-	}	
-	if ($issue_total != 0)
-		//Chaitanya : Apply cost to QOH as adjustment only
-		add_issue_cost($details['stock_id'], $details['units_reqd'], $date_, $issue_total, true);
-	$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);	
+			$ivaccount = $stockitem["cogs_account"];
+
+        $total_cost += add_gl_trans_std_cost(ST_MANUISSUE, $number, $date_, $ivaccount, 0, 0,
+                $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost);
+	}
+
+    $stockitem = get_item($wo['stock_id']);
+
+   	$wip_account = $stockitem["wip_account"];
+
+    add_gl_trans_std_cost(ST_MANUISSUE, $number, $date_, $wip_account,
+        0, 0, $date_.": "._("Issue to")." ".$stockitem["description"], -$total_cost);
 
 	if ($memo_)
 		add_comments(ST_MANUISSUE, $number, $date_, $memo_);
@@ -97,6 +81,7 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 
 	$args->trans_no = $number;
 	hook_db_postwrite($args, ST_MANUISSUE);
+
 	commit_transaction();
 }
 
@@ -111,27 +96,31 @@ function get_work_order_issues($woid)
 
 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";
+	$sql = "SELECT issue.*, item.*, stock.mb_flag
+		FROM ".TB_PREF."wo_issues issue, "
+			.TB_PREF."wo_issue_items item
+			LEFT JOIN ".TB_PREF."stock_master stock ON stock.stock_id=item.stock_id
+		WHERE issue.issue_no=item.issue_id
+		AND issue.workorder_id=".db_escape($woid)
+		." ORDER BY item.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
+	$sql = "SELECT DISTINCT issue.*, wo.stock_id, wo.closed,
+		item.description, loc.location_name, center.name AS WorkCentreName
+		FROM ".TB_PREF."wo_issues issue,"
+			.TB_PREF."workorders wo,"
+			.TB_PREF."stock_master item,"
+			.TB_PREF."locations loc,"
+			.TB_PREF."workcentres center
 		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
-		AND ".TB_PREF."stock_master.stock_id = ".TB_PREF."workorders.stock_id";
+		AND wo.id = issue.workorder_id
+		AND loc.loc_code = issue.loc_code
+		AND center.id = issue.workcentre_id
+		AND item.stock_id = wo.stock_id";
     $result = db_query($sql, "A work order issue could not be retrieved");
 
     return db_fetch($result);
@@ -141,12 +130,12 @@ 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
-		FROM ".TB_PREF."wo_issue_items, ".TB_PREF."stock_master
+	$sql = "SELECT issue.*, item.description, item.units
+		FROM ".TB_PREF."wo_issue_items issue,"
+			.TB_PREF."stock_master item
 		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";
+		AND item.stock_id=issue.stock_id
+		ORDER BY issue.id";
     return db_query($sql, "The work order issue items could not be retrieved");
 }
 
@@ -162,71 +151,38 @@ function exists_work_order_issue($issue_no)
 
 //--------------------------------------------------------------------------------------
 
+function check_void_wo_issue($issue_no)
+{
+	$issue = get_work_order_issue($issue_no);
+
+	return $issue['closed'] ? $issue['workorder_id'] : 0;
+}
+
+//--------------------------------------------------------------------------------------
+
 function void_work_order_issue($type_no)
 {
 	begin_transaction();
 	hook_db_prevoid(ST_MANUISSUE, $type_no);
 
-	//Chaitanya : Skip processing already voided entry i.e. explicitly voided
 	$void_entry = get_voided_entry(ST_MANUISSUE, $type_no);
 	if ($void_entry)
 		return;
 
+	if (check_void_wo_issue($type_no))
+		return;
+
+	// FIXME update issued material cost
+
 	// void the actual issue items and their quantities
-	$sql = "UPDATE ".TB_PREF."wo_issue_items Set qty_issued = 0 WHERE issue_id="
-		.db_escape($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 any related gl trans
-	//Chaitanya : Nothing happens due to next statement as all gl postings are done against WO
-	//void_gl_trans(ST_MANUISSUE, $type_no, true);
-	
-	//Chaitanya : Reverse the gl posting
-	$issue = get_work_order_issue($type_no);
-	$manf_stock_id = $issue["stock_id"];
-	$date_ = sql2date($issue["issue_date"]);
-	$woid = $issue["workorder_id"];
-
-	$result = get_stock_moves(ST_MANUISSUE, $type_no);
-	$total_cost = 0;
-	$issue_total = 0;
-	while ($myrow = db_fetch($result))
-	{
-		$issue_cost = $myrow["qty"]*$myrow["standard_cost"];
-		$issue = get_stock_gl_code($myrow["stock_id"]);
-        $stockitem = get_item($myrow["stock_id"]);
+	void_gl_trans(ST_MANUISSUE, $type_no);
 
-		//Chaitanya : Compatibility for Service Items
-		if (!is_service($issue["mb_flag"]))
-			$ivaccount = $issue["inventory_account"];
-		else
-			$ivaccount = $issue["cogs_account"];
-
-		if ($issue_cost != 0)
-		{
-			$total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
-				$date_.": "._("Reversed the issue of")." ".$stockitem["description"],
-				-$issue_cost);
-			$issue_total += $issue_cost;
-		}
-	}
-	if ($issue_total != 0)
-		//Chaitanya : Revese cost effect on manfactured stock item as adjustment only
-		add_issue_cost($manf_stock_id, 0, $date_, $issue_total, true);
-	$issue = get_stock_gl_code($manf_stock_id);
-    $stockitem = get_item($manf_stock_id);
-	if ($total_cost != 0)
-		add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"],
-			0, 0, $date_.": "._("Reversed the issue to")." ".$stockitem["description"], 
-			-$total_cost);	
-
-	//Chaitanya : Shifted below void all related stock moves
 	void_stock_move(ST_MANUISSUE, $type_no);
 
 	commit_transaction();
 }
-
-
-//--------------------------------------------------------------------------------------
-
-?>
\ No newline at end of file