X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_produce_items_db.inc;h=1c72f94f3cc8d8e25409aa9d93380a549d35753a;hb=19d08aef75bd8960f1f0452303750ed0387fb1b8;hp=9b2095c076141fdce58e949a8ab2c5ed1999d4d7;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;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 9b2095c0..1c72f94f 100644
--- a/manufacturing/includes/db/work_order_produce_items_db.inc
+++ b/manufacturing/includes/db/work_order_produce_items_db.inc
@@ -44,20 +44,29 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
 	db_query($sql,"A work order manufacture could not be added");
 
 	$id = db_insert_id();
+	
+	// -------------------------------------------------------------------------
 
+	work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, $id);
+	
 	// -------------------------------------------------------------------------
 
-	work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, $id);
+	// Chaitanya: stamp BOM cost to finished item
+	$m_cost = 0;
+    $result = get_bom($details["stock_id"]);
+	while ($bom_item = db_fetch($result))
+	{
+		$standard_cost = get_standard_cost($bom_item['component']);
+		$m_cost += ($bom_item['quantity'] * $standard_cost);
+	}	
 
-	// -------------------------------------------------------------------------
 	// insert a +ve stock move for the item being manufactured
 	// negative means "unproduce" or unassemble
 	add_stock_move(ST_MANURECEIVE, $details["stock_id"], $id,
-		$details["loc_code"], $date_, $ref, $quantity, 0);
+		$details["loc_code"], $date_, $ref, $quantity, $m_cost);
 	// update wo quantity and close wo if requested
 	work_order_update_finished_quantity($woid, $quantity, $close_wo);
 
-
 	if ($memo_)
 		add_comments(ST_MANURECEIVE, $id, $date_, $memo_);
 
@@ -109,24 +118,56 @@ function void_work_order_produce($type_no)
 {
 	begin_transaction();
 	hook_db_prevoid(ST_MANURECEIVE, $type_no);
+	
+	//Chaitanya : Skip processing already voided entry i.e. explicitly voided
+	$void_entry = get_voided_entry(ST_MANURECEIVE, $type_no);
+	if ($void_entry)
+		return;	
 
 	$row = 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"]);
 
-	work_order_quick_costs($row['workorder_id'], $row['stock_id'], -$row['quantity'], sql2date($row['date_']), $type_no);
-
+	//Chaitanya : skipped this step as BOM may have got changed
+	//work_order_quick_costs($row['workorder_id'], $row['stock_id'], -$row['quantity'], sql2date($row['date_']), $type_no);
+
+	// void any related gl trans
+	//Chaitanya : Nothing happens due to next statement as all gl postings are done against WO
+	//void_gl_trans(ST_MANURECEIVE, $type_no, true);
+	
+	$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"]);
+		
+		//Chaitanya : Compatibility for Service Items
+		if (!is_service($issue["mb_flag"]))
+			$ivaccount = $issue["inventory_account"];
+		else
+			$ivaccount = $issue["cogs_account"];		
+		
+		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");
-
+	db_query($sql, "Cannot void a wo production");			
+	
+	//Chaitanya : Shifted below
 	// void all related stock moves
 	void_stock_move(ST_MANURECEIVE, $type_no);
 
-	// void any related gl trans
-	void_gl_trans(ST_MANURECEIVE, $type_no, true);
-
 	commit_transaction();
 }