X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_produce_items_db.inc;h=d67d2e9048dce7891e853f813b9ed290434c0077;hb=e0544eddcab799b9088e0a774f63443e3f634bb6;hp=c9131df8ba586d790c3fc6a4d187238e14a5d73c;hpb=3dc709543cc713810811d269a8b2ce035146a559;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 c9131df8..d67d2e90 100644
--- a/manufacturing/includes/db/work_order_produce_items_db.inc
+++ b/manufacturing/includes/db/work_order_produce_items_db.inc
@@ -11,7 +11,14 @@
 ***********************************************************************/
 function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
 {
+	global $Refs;
+
 	begin_transaction();
+	$args = func_get_args();
+	$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);
 
@@ -31,30 +38,56 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo)
     $date = date2sql($date_);
 
     $sql = "INSERT INTO ".TB_PREF."wo_manufacture (workorder_id, reference, quantity, date_)
-		VALUES ($woid, ".db_escape($ref).", $quantity, '$date')";
+		VALUES (".db_escape($woid).", ".db_escape($ref).", ".db_escape($quantity)
+		.", '$date')";
 
 	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);
+	
+	// -------------------------------------------------------------------------
+
+	// 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);
+	}
+	// new Joe Hunt 2015.10.15	
+	// additilnal costs.
+	if (work_order_has_issues($woid))
+	{
+		$res = get_additional_issues($woid);
+		while ($issue = db_fetch($res))
+		{
+			$standard_cost = get_standard_cost($issue['stock_id']);
+			$m_cost += ($issue['qty_issued'] * $standard_cost) / $quantity;
+		}
+	}
+	$m_cost += (get_gl_wo_cost($woid, WO_LABOUR) / $quantity);
+	$m_cost += (get_gl_wo_cost($woid, WO_OVERHEAD) / $quantity);
 
 	// insert a +ve stock move for the item being manufactured
 	// negative means "unproduce" or unassemble
-	add_stock_move(29, $details["stock_id"], $id,
-		$details["loc_code"], $date_, $memo_, $quantity, 0);
-
+	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);
 
-	// -------------------------------------------------------------------------
-
-	work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, true);
-
-	// -------------------------------------------------------------------------
 	if ($memo_)
-		add_comments(29, $id, $date_, $memo_);
+		add_comments(ST_MANURECEIVE, $id, $date_, $memo_);
 
-	references::save_last($ref, 29);
+	$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();
 }
 
@@ -62,11 +95,12 @@ 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
+	$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=$id";
+		AND ".TB_PREF."wo_manufacture.id=".db_escape($id);
     $result = db_query($sql, "The work order production could not be retrieved");
 
     return db_fetch($result);
@@ -76,7 +110,8 @@ function get_work_order_produce($id)
 
 function get_work_order_productions($woid)
 {
-	$sql = "SELECT * FROM ".TB_PREF."wo_manufacture WHERE workorder_id=$woid ORDER BY id";
+	$sql = "SELECT * FROM ".TB_PREF."wo_manufacture WHERE workorder_id="
+		.db_escape($woid)." ORDER BY id";
     return db_query($sql, "The work order issues could not be retrieved");
 }
 
@@ -84,7 +119,7 @@ function get_work_order_productions($woid)
 
 function exists_work_order_produce($id)
 {
-	$sql = "SELECT id FROM ".TB_PREF."wo_manufacture WHERE id=$id";
+	$sql = "SELECT id FROM ".TB_PREF."wo_manufacture WHERE id=".db_escape($id);
 	$result = db_query($sql, "Cannot retreive a wo production");
 
     return (db_num_rows($result) > 0);
@@ -95,21 +130,56 @@ function exists_work_order_produce($id)
 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"]);
 
-	// clear the production record
-	$sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=$type_no";
-	db_query($sql, "Cannot void a wo production");
-
-	// void all related stock moves
-	void_stock_move(29, $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
-	void_gl_trans(29, $type_no, true);
+	//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");			
+	
+	//Chaitanya : Shifted below
+	// void all related stock moves
+	void_stock_move(ST_MANURECEIVE, $type_no);
 
 	commit_transaction();
 }