X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_produce_items_db.inc;h=c05bac96c7b2d214be113e23972643394e404e02;hb=fcf15181965c266c81d7f142cd5e92e7818e958e;hp=1d87faef51018e7381fce2ea276630127743e60d;hpb=d1babda7c01b314d35fb89f2d195553b55936532;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 1d87faef..c05bac96 100644
--- a/manufacturing/includes/db/work_order_produce_items_db.inc
+++ b/manufacturing/includes/db/work_order_produce_items_db.inc
@@ -9,31 +9,20 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
+function work_order_produce($woid, $ref, $quantity, $date_, $memo, $close_wo)
 {
 	global $Refs;
 
+// FIXME: support for WO_UNASSEMBLY case
 	begin_transaction();
+
 	$args = func_get_args();
-	$args = (object)array_combine(array('woid', 'ref', 'quantity', 'date_', 'memo_','close_wo'),
+	$args = (object)array_combine(array('woid', 'ref', 'quantity', 'date_', 'memo','close_wo'),
 		$args);
 	$args->trans_no = 0;
 	hook_db_prewrite($args, ST_MANURECEIVE);
 
-	$details = get_work_order($woid);
-
-    if (strlen($details[0]) == 0)
-    {
-    	echo _("The order number sent is not valid.");
-    	exit;
-    }
-
-	if (work_order_is_closed($woid))
-	{
-		display_error("UNEXPECTED : Producing Items for a closed Work Order");
-		cancel_transaction();
-		exit;
-	}
+	$product = get_work_order($woid);
 
     $date = date2sql($date_);
 
@@ -46,34 +35,68 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
 	$id = db_insert_id();
 
 	// -------------------------------------------------------------------------
+	// insert -ve and update averaged component unit cost for BOM usage (in wo_requirements)
+	work_order_production_gl($woid, $product["stock_id"], $quantity, $date_, $id);
 
-	work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, $id);
-	// -------------------------------------------------------------------------
+	// update wo quantity and close wo if requested (or finished)
+	$closed = work_order_update_finished_quantity($woid, $quantity, $close_wo);
 
-	// Chaitanya: stamp BOM cost to finished item
-	$m_cost = 0;
-    $result = get_bom($details["stock_id"]);
-	while ($bom_item = db_fetch($result))
+	// unit_cost is known when WO is finished, then generate +ve for all items
+	if ($closed)
 	{
-		$standard_cost = get_standard_cost($bom_item['component']);
-		$m_cost += ($bom_item['quantity'] * $standard_cost);
-	}
+		// 1. calculate sums of material/labour/overhead costs
+
+		// sum collected BOM material & labour costs (no way for separate overhead here for now - needs flag in bom or stock_master)
+		$bom = get_wo_requirements($woid);
+		$m_cost = $l_cost = 0;
+		while ($component = db_fetch($bom))
+		{
+			if (!is_service($component["mb_flag"]))
+				$m_cost += $component['unit_cost']*$component['units_issued'];
+			else
+				$l_cost += $component['unit_cost']*$component['units_issued'];
+		}
+
+		// add additional material issues
+		$issues = get_additional_issues($woid);
+		while ($issue = db_fetch($issues))
+		{
+			if (!is_service($issue["mb_flag"]))
+				$m_cost += $issue['unit_cost']*$issue['qty_issued'];
+			else
+				$l_cost += $issue['unit_cost']*$issue['qty_issued'];
+		}
+
+		// and additional costs
+		$o_cost = get_gl_wo_cost($woid, WO_OVERHEAD);
+		$l_cost += get_gl_wo_cost($woid, WO_LABOUR);
+
+		$total_cost = $o_cost + $m_cost + $l_cost;
+
+	    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'],
+	   	    0, 0, $memo, $total_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, $m_cost);
-	// update wo quantity and close wo if requested
-	work_order_update_finished_quantity($woid, $quantity, $close_wo);
+		$unit_cost = $total_cost/($product['units_issued']+$quantity);
 
-	if ($memo_)
-		add_comments(ST_MANURECEIVE, $id, $date_, $memo_);
+		// 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);
+	}
+
+	if ($memo)
+		add_comments(ST_MANURECEIVE, $id, $date_, $memo);
 
 	$Refs->save(ST_MANURECEIVE, $id, $ref);
 	add_audit_trail(ST_MANURECEIVE, $id, $date_, _("Production."));
 
 	$args->trans_no = $id;
 	hook_db_postwrite($args, ST_MANURECEIVE);
+
 	commit_transaction();
 }
 
@@ -81,12 +104,13 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
 
 function get_work_order_produce($id)
 {
-	$sql = "SELECT ".TB_PREF."wo_manufacture.*,".TB_PREF."workorders.stock_id, "
-		.TB_PREF."stock_master.description AS StockDescription
-		FROM ".TB_PREF."wo_manufacture, ".TB_PREF."workorders, ".TB_PREF."stock_master
-		WHERE ".TB_PREF."wo_manufacture.workorder_id=".TB_PREF."workorders.id
-		AND ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id
-		AND ".TB_PREF."wo_manufacture.id=".db_escape($id);
+	$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
+		WHERE prod.workorder_id=wo.id
+		AND item.stock_id=wo.stock_id
+		AND prod.id=".db_escape($id);
     $result = db_query($sql, "The work order production could not be retrieved");
 
     return db_fetch($result);
@@ -111,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)
@@ -118,52 +150,25 @@ 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
+	// 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"]);
-
-	//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"]);
+	if (work_order_is_closed($prod['workorder_id']))
+		return;
 
-		//Chaitanya : 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");
 
-	//Chaitanya : Shifted below
-	// void all related stock moves
+	void_gl_trans(ST_MANURECEIVE, $type_no);
+
 	void_stock_move(ST_MANURECEIVE, $type_no);
 
 	commit_transaction();