X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_produce_items_db.inc;h=c05bac96c7b2d214be113e23972643394e404e02;hb=e9edcdc75487682714ecf16d682d49d0a332abc9;hp=fecc34bf5ac923124d577f6f1794d9c731b165ea;hpb=a601f3740bb0ce5d13bf1c4cb616f70abb99baae;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 fecc34bf..c05bac96 100644
--- a/manufacturing/includes/db/work_order_produce_items_db.inc
+++ b/manufacturing/includes/db/work_order_produce_items_db.inc
@@ -39,7 +39,7 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo, $close_wo)
 	work_order_production_gl($woid, $product["stock_id"], $quantity, $date_, $id);
 
 	// update wo quantity and close wo if requested (or finished)
-	$closed = work_order_update_finished_quantity($woid, $quantity, $date_, $close_wo);
+	$closed = work_order_update_finished_quantity($woid, $quantity, $close_wo);
 
 	// unit_cost is known when WO is finished, then generate +ve for all items
 	if ($closed)
@@ -73,7 +73,7 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo, $close_wo)
 
 		$total_cost = $o_cost + $m_cost + $l_cost;
 
-	    add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $product['assembly_account'],
+	    add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $product['wip_account'],
     	    0, 0, $memo, -$total_cost);
 
 	    add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $product['inventory_account'],
@@ -81,10 +81,11 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo, $close_wo)
 
 		$unit_cost = $total_cost/($product['units_issued']+$quantity);
 
+		// first update material cost
+		update_material_cost($product['stock_id'], $product['units_issued']+$quantity, $unit_cost, $date_);
+
 		add_stock_move(ST_WORKORDER, $product["stock_id"], $woid,
 			$product["loc_code"], $date_, $ref, $product['units_issued']+$quantity, $unit_cost);
-
-		update_material_cost($product['stock_id'], $product['units_issued']+$quantity, $unit_cost, $date_);
 	}
 
 	if ($memo)
@@ -103,7 +104,7 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo, $close_wo)
 
 function get_work_order_produce($id)
 {
-	$sql = "SELECT prod.*, wo.stock_id, item.description AS StockDescription
+	$sql = "SELECT prod.*, wo.stock_id, item.description AS StockDescription, wo.closed
 			FROM ".TB_PREF."wo_manufacture prod,"
 				.TB_PREF."workorders wo,"
 				.TB_PREF."stock_master item
@@ -134,6 +135,14 @@ function exists_work_order_produce($id)
     return (db_num_rows($result) > 0);
 }
 
+//--------------------------------------------------------------------------------------
+
+function check_void_wo_production($prod_no)
+{
+	$prod = get_work_order_produce($prod_no);
+	return $prod['closed'] ? $prod['workorder_id'] : 0;
+}
+
 //--------------------------------------------------------------------------------------------
 
 function void_work_order_produce($type_no)
@@ -144,44 +153,22 @@ function void_work_order_produce($type_no)
 	// Skip processing already voided entry i.e. explicitly voided
 	$void_entry = get_voided_entry(ST_MANURECEIVE, $type_no);
 	if ($void_entry)
-		return;	
+		return;
 
-	$row = get_work_order_produce($type_no);
+	$prod = get_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"]);
-
-	// void any related gl trans
+	if (work_order_is_closed($prod['workorder_id']))
+		return;
 
-	$woid = $row["workorder_id"];
-	$date_ = sql2date($row["date_"]);
-		
-	$result = get_stock_moves(ST_MANURECEIVE, $type_no);
-	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"]);
-
-		// Compatibility for Service Items
-		if (!is_service($issue["mb_flag"]))
-			$ivaccount = $issue["inventory_account"];
-		else
-			$ivaccount = $issue["cogs_account"];
+	// deduct the quantity of this production from the parent work order
+	work_order_update_finished_quantity($prod["workorder_id"], -$prod["quantity"], false);
 
-		if ($issue_cost != 0)
-		{
-			add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0,
-				$date_.": "._("Reversed the production ")." ".$stockitem["description"],
-				-$issue_cost);
-		}
-	}
 	// clear the production record
 	$sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".db_escape($type_no);
 	db_query($sql, "Cannot void a wo production");
 
-	// Shifted below
-	// void all related stock moves
+	void_gl_trans(ST_MANURECEIVE, $type_no);
+
 	void_stock_move(ST_MANURECEIVE, $type_no);
 
 	commit_transaction();