X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_issues_db.inc;h=422e0019beea4f0959ee1d045d89ad2ab3d16e82;hb=a0e36794a39ed024175b216413ee80cbeced2946;hp=fd89356a12921210ee3a2d140249a525424735b4;hpb=a601f3740bb0ce5d13bf1c4cb616f70abb99baae;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 fd89356a..422e0019 100644
--- a/manufacturing/includes/db/work_order_issues_db.inc
+++ b/manufacturing/includes/db/work_order_issues_db.inc
@@ -36,7 +36,7 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 
 	foreach ($items as $item)
 	{
-		if ($to_work_order)
+		if ($to_work_order)	// otherwise it is material return to inventory
 			$item->quantity = -$item->quantity;
 
 		$unit_cost = get_unit_cost($item->stock_id);
@@ -64,15 +64,11 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w
 
         $total_cost += add_gl_trans_std_cost(ST_MANUISSUE, $number, $date_, $ivaccount, 0, 0,
                 $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost);
-		$issue_total += $issue_cost;
 	}
 
-	if ($issue_total != 0)	// Apply cost to QOH as adjustment only
-		add_issue_cost($wo['stock_id'], $wo['units_reqd'], $date_, $issue_total, true);
-
     $stockitem = get_item($wo['stock_id']);
 
-   	$wip_account = $stockitem["assembly_account"];
+   	$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);
@@ -113,7 +109,7 @@ function get_additional_issues($woid)
 
 function get_work_order_issue($issue_no)
 {
-	$sql = "SELECT DISTINCT issue.*, wo.stock_id,
+	$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,"
@@ -155,66 +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);
-	db_query($sql,"A work order issue item could not be voided");
+	$sql = "UPDATE ".TB_PREF."wo_issue_items SET qty_issued = 0
+		WHERE issue_id=".db_escape($type_no);
 
-	// 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"];
+	db_query($sql,"A work order issue item could not be voided");
 
-	$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);
 
-		// 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)
-		// 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);
-
-	// Shifted below void all related stock moves
 	void_stock_move(ST_MANUISSUE, $type_no);
 
 	commit_transaction();
 }
-
-
-//--------------------------------------------------------------------------------------
-